From gerrit-no-reply at lists.osmocom.org Sat Sep 1 07:40:45 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sat, 1 Sep 2018 07:40:45 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10733 Change subject: Log using GSM48 Cause Value strings ...................................................................... Log using GSM48 Cause Value strings Use gsm48_cc_cause_name() in logging messages Depends-On: I296f208581ce2550805f9d96e20f7319e1199023 Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 --- M src/mncc.c M src/sip.c 2 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/33/10733/1 diff --git a/src/mncc.c b/src/mncc.c index 2de0482..25b6702 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -25,6 +25,7 @@ #include "call.h" #include +#include #include #include @@ -264,7 +265,7 @@ case MNCC_CC_PROCEEDING: case MNCC_CC_CONNECTED: LOGP(DMNCC, LOGL_DEBUG, - "Releasing call in non-initial leg(%u) cause(%d)\n", leg->callref, leg->base.cause); + "Releasing call in non-initial leg(%u) cause(%s)\n", leg->callref, gsm48_cc_cause_name(leg->base.cause)); leg->base.in_release = true; start_cmd_timer(leg, MNCC_REL_IND); mncc_send(leg->conn, MNCC_DISC_REQ, leg->callref); @@ -508,7 +509,7 @@ return; LOGP(DMNCC, - LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %d\n", data->cause.value); + LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %s\n", gsm48_cc_cause_name(data->cause.value)); LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was disconnected. Releasing\n", data->callref); leg->base.in_release = true; @@ -530,7 +531,7 @@ if (!leg) return; - LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %d\n", data->cause.value); + LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %s\n", gsm48_cc_cause_name(data->cause.value)); if (leg->base.in_release) stop_cmd_timer(leg, MNCC_REL_IND); @@ -588,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 with cause(%d).\n", data->callref, leg->cause); + LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected with cause(%s).\n", data->callref, gsm48_cc_cause_name(leg->cause)); mncc_leg_release(leg); } diff --git a/src/sip.c b/src/sip.c index cf457ad..adf20d8 100644 --- a/src/sip.c +++ b/src/sip.c @@ -298,12 +298,12 @@ *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); + LOGP(DSIP, LOGL_DEBUG, "%s(): Mapping cause(%s) to status(%d)\n", + __func__, gsm48_cc_cause_name(cause), *sip_status); return; } } - LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%d) not found in map.\n", __func__, cause); + LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%s) not found in map.\n", __func__, gsm48_cc_cause_name(cause)); *sip_status = cause_map[i].sip_status; *sip_phrase = cause_map[i].sip_phrase; *reason_text = cause_map[i].q850_reason; @@ -327,7 +327,7 @@ * to help us here. */ - LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%d)\n", __func__, _leg->cause); + LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause)); cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text); snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 1 07:45:37 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sat, 1 Sep 2018 07:45:37 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10733 to look at the new patch set (#2). Change subject: Log using GSM48 Cause Value strings ...................................................................... Log using GSM48 Cause Value strings Use gsm48_cc_cause_name() in logging messages Depends-On: I296f208581ce2550805f9d96e20f7319e1199023 Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 --- M src/mncc.c M src/sip.c 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/33/10733/2 -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 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 Sat Sep 1 10:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 1 Sep 2018 10:43:41 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array In-Reply-To: References: Message-ID: Harald Welte 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_n [?] very much so, yes. I was about to mkae that comment myself. I'm not a big fan of OSMO_VALUE_STRING for exactly that resason. -- 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: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Sat, 01 Sep 2018 10:43:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 1 10:44:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 1 Sep 2018 10:44:00 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10733 ) Change subject: Log using GSM48 Cause Value strings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 01 Sep 2018 10:44: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 Sep 1 10:45:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 1 Sep 2018 10:45:09 +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 3: Code-Review+2 -- 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: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 01 Sep 2018 10: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 Sat Sep 1 21:56:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 1 Sep 2018 21:56:01 +0000 Subject: Change in simtrace2[master]: stdio: fix detection of malformated format strings In-Reply-To: References: Message-ID: Neels Hofmeyr 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 407 PS1, Line 407: va_end(ap); yes, should va_end() before evaluating rc. Then again, you're just returning rc in both cases, so why even have this "if"? IIUC this patch doesn't change a thing about anything. Do you mean to preserve errno or something?? -- 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-CC: Neels Hofmeyr Gerrit-Comment-Date: Sat, 01 Sep 2018 21:56:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 2 08:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sun, 2 Sep 2018 08:57:12 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( 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, 25 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/call.h b/src/call.h index 5a11f6c..de92a24 100644 --- a/src/call.h +++ b/src/call.h @@ -43,6 +43,8 @@ struct call *call; bool in_release; + /* Field to hold GSM 04.08 Cause Value. Section 10.5.4.11 Table 10.86 */ + int cause; /** * RTP data @@ -130,6 +132,8 @@ int rsp_wanted; struct mncc_connection *conn; + /* Field to hold GSM 04.08 Cause Value. Section 10.5.4.11 Table 10.86 */ + 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 07d2286..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 */ @@ -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: merged 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: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 2 10:34:04 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sun, 2 Sep 2018 10:34:04 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array 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/10732 to look at the new patch set (#2). 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/2 -- 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: newpatchset Gerrit-Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 Gerrit-Change-Number: 10732 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 Mon Sep 3 09:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 09:32:21 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix missing conditional clause Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10734 Change subject: mncc: Fix missing conditional clause ...................................................................... mncc: Fix missing conditional clause Fixes following compilation warning: osmo-sip-connector/src/mncc.c: In function ?check_disc_ind?: osmo-sip-connector/src/mncc.c:517:2: warning: this ?if? clause does not guard... [-Wmisleading-indentation] if (other_leg) ^~ Fixes: 008915ee41900c34ec0fd8df0c9f1d7c2cbdb3b2 ("Implement Cause Mapping") Change-Id: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f --- M src/mncc.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/34/10734/1 diff --git a/src/mncc.c b/src/mncc.c index f41bb51..ae60321 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -514,9 +514,10 @@ mncc_send(leg->conn, MNCC_REL_REQ, leg->callref); other_leg = call_leg_other(&leg->base); - if (other_leg) + if (other_leg) { other_leg->cause = data->cause.value; other_leg->release_call(other_leg); + } } static void check_rel_ind(struct mncc_connection *conn, const char *buf, int rc) @@ -533,9 +534,10 @@ else { struct call_leg *other_leg; other_leg = call_leg_other(&leg->base); - if (other_leg) + 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); mncc_leg_release(leg); @@ -581,9 +583,10 @@ leg->cause = data->cause.value; other_leg = call_leg_other(&leg->base); - if (other_leg) + 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); } -- To view, visit https://gerrit.osmocom.org/10734 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: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f Gerrit-Change-Number: 10734 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 Sep 3 09:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 09:34:02 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10728 ) Change subject: Implement Cause Mapping ...................................................................... Patch Set 3: Have a look at https://gerrit.osmocom.org/#/c/osmo-sip-connector/+/10734, I submitted it to fix a bug in this commit. -- 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: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Sep 2018 09:34:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 10:36:49 2018 From: gerrit-no-reply at lists.osmocom.org (Ivan Kluchnikov) Date: Mon, 3 Sep 2018 10:36:49 +0000 Subject: Change in osmo-bsc[master]: gsm48_parse_meas_rep(): set num_cell=0 if no neighbor cells are reported In-Reply-To: References: Message-ID: Ivan Kluchnikov has posted comments on this change. ( https://gerrit.osmocom.org/7149 ) Change subject: gsm48_parse_meas_rep(): set num_cell=0 if no neighbor cells are reported ...................................................................... Patch Set 1: Hi Neels, We have faced with the same issue in openbsc project, I figured out that it was fixed in osmo-bsc project, but it was not merged to openbsc. This patch is relevant to osmo-bsc and openbsc projects and it fixes critical handover issue. Please, could you merge this fix to openbsc? -- To view, visit https://gerrit.osmocom.org/7149 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: Ie12210660a04f2d664ddc92e7ad7fc39ee474180 Gerrit-Change-Number: 7149 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Ivan Kluchnikov Gerrit-Comment-Date: Mon, 03 Sep 2018 10:36:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 10:46:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Sep 2018 10:46:05 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix missing conditional clause In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10734 ) Change subject: mncc: Fix missing conditional clause ...................................................................... Patch Set 1: Code-Review+1 Yep, C is not Python :) -- To view, visit https://gerrit.osmocom.org/10734 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: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f Gerrit-Change-Number: 10734 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 10:46: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 Sep 3 10:48:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Sep 2018 10:48:43 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix missing conditional clause In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10734 ) Change subject: mncc: Fix missing conditional clause ...................................................................... Patch Set 1: This also shows that there is no testing coverage of the recently introduced features :/ Probably, even no manual testing, otherwise this should have been noticed. -- To view, visit https://gerrit.osmocom.org/10734 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: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f Gerrit-Change-Number: 10734 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 10:48:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 11:13:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 11:13:55 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix missing conditional clause In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10734 ) Change subject: mncc: Fix missing conditional clause ...................................................................... Patch Set 1: Indeed, we are lacking --enable-werror in configure.ac and enabling it in jenkins script. I'll do that. -- To view, visit https://gerrit.osmocom.org/10734 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: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f Gerrit-Change-Number: 10734 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 11:13:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 11:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 11:19:44 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: Introduce --enable-werror option Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10735 Change subject: configure.ac: Introduce --enable-werror option ...................................................................... configure.ac: Introduce --enable-werror option Change-Id: I1666df1721ba9acc950612558e07a1a2e7b2bb85 --- M configure.ac 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/35/10735/1 diff --git a/configure.ac b/configure.ac index e84cb83..916cfc3 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,24 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) +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_ENABLE([vty_tests], AC_HELP_STRING([--enable-vty-tests], [Include the VTY/CTRL tests in make check (deprecated) @@ -47,6 +65,11 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) +AC_MSG_RESULT([CFLAGS="$CFLAGS"]) +AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) +AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) + AC_OUTPUT( src/Makefile tests/Makefile -- To view, visit https://gerrit.osmocom.org/10735 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: I1666df1721ba9acc950612558e07a1a2e7b2bb85 Gerrit-Change-Number: 10735 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 Sep 3 11:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 11:19:44 +0000 Subject: Change in osmo-sip-connector[master]: jenkins.sh: Use --enable-werror option Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10736 Change subject: jenkins.sh: Use --enable-werror option ...................................................................... jenkins.sh: Use --enable-werror option Change-Id: I8cfad742e6ce766b022ecdf4c78495accc9405d0 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/36/10736/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0b11ef3..00cd5ff 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -27,7 +27,7 @@ set -x autoreconf --install --force -./configure --enable-vty-tests --enable-external-tests +./configure --enable-werror --enable-vty-tests --enable-external-tests $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/10736 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: I8cfad742e6ce766b022ecdf4c78495accc9405d0 Gerrit-Change-Number: 10736 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 Sep 3 11:54:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Sep 2018 11:54:35 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: Introduce --enable-werror option In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10735 ) Change subject: configure.ac: Introduce --enable-werror option ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10735 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: I1666df1721ba9acc950612558e07a1a2e7b2bb85 Gerrit-Change-Number: 10735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 11:54: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 Sep 3 11:54:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Sep 2018 11:54:43 +0000 Subject: Change in osmo-sip-connector[master]: jenkins.sh: Use --enable-werror option In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10736 ) Change subject: jenkins.sh: Use --enable-werror option ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10736 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: I8cfad742e6ce766b022ecdf4c78495accc9405d0 Gerrit-Change-Number: 10736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 11:54: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 Sep 3 12:11:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:11:03 +0000 Subject: Change in osmo-bsc[master]: gsm48_parse_meas_rep(): set num_cell=0 if no neighbor cells are reported In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7149 ) Change subject: gsm48_parse_meas_rep(): set num_cell=0 if no neighbor cells are reported ...................................................................... Patch Set 1: > Please, could you merge this fix to openbsc? I would suggest that you simply take care of the back-porting and push it to gerrit for openbsc.git. Thanks! -- To view, visit https://gerrit.osmocom.org/7149 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: Ie12210660a04f2d664ddc92e7ad7fc39ee474180 Gerrit-Change-Number: 7149 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Ivan Kluchnikov Gerrit-Comment-Date: Mon, 03 Sep 2018 12:11:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 12:11:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:11:59 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix missing conditional clause In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10734 ) Change subject: mncc: Fix missing conditional clause ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10734 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: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f Gerrit-Change-Number: 10734 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 12:11:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 12:12:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:01 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: Introduce --enable-werror option In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10735 ) Change subject: configure.ac: Introduce --enable-werror option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10735 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: I1666df1721ba9acc950612558e07a1a2e7b2bb85 Gerrit-Change-Number: 10735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 12:12: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 Sep 3 12:12:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:04 +0000 Subject: Change in osmo-sip-connector[master]: jenkins.sh: Use --enable-werror option In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10736 ) Change subject: jenkins.sh: Use --enable-werror option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10736 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: I8cfad742e6ce766b022ecdf4c78495accc9405d0 Gerrit-Change-Number: 10736 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 12:12: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 Sep 3 12:12:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:05 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix missing conditional clause In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10734 ) Change subject: mncc: Fix missing conditional clause ...................................................................... mncc: Fix missing conditional clause Fixes following compilation warning: osmo-sip-connector/src/mncc.c: In function ?check_disc_ind?: osmo-sip-connector/src/mncc.c:517:2: warning: this ?if? clause does not guard... [-Wmisleading-indentation] if (other_leg) ^~ Fixes: 008915ee41900c34ec0fd8df0c9f1d7c2cbdb3b2 ("Implement Cause Mapping") Change-Id: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f --- M src/mncc.c 1 file changed, 6 insertions(+), 3 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/mncc.c b/src/mncc.c index f41bb51..ae60321 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -514,9 +514,10 @@ mncc_send(leg->conn, MNCC_REL_REQ, leg->callref); other_leg = call_leg_other(&leg->base); - if (other_leg) + if (other_leg) { other_leg->cause = data->cause.value; other_leg->release_call(other_leg); + } } static void check_rel_ind(struct mncc_connection *conn, const char *buf, int rc) @@ -533,9 +534,10 @@ else { struct call_leg *other_leg; other_leg = call_leg_other(&leg->base); - if (other_leg) + 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); mncc_leg_release(leg); @@ -581,9 +583,10 @@ leg->cause = data->cause.value; other_leg = call_leg_other(&leg->base); - if (other_leg) + 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); } -- To view, visit https://gerrit.osmocom.org/10734 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: I5bdbc29a3f82bdc92b156c1f7df68c9503f85f8f Gerrit-Change-Number: 10734 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) 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 Mon Sep 3 12:12:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:05 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: Introduce --enable-werror option In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10735 ) Change subject: configure.ac: Introduce --enable-werror option ...................................................................... configure.ac: Introduce --enable-werror option Change-Id: I1666df1721ba9acc950612558e07a1a2e7b2bb85 --- M configure.ac 1 file changed, 23 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/configure.ac b/configure.ac index e84cb83..916cfc3 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,24 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) +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_ENABLE([vty_tests], AC_HELP_STRING([--enable-vty-tests], [Include the VTY/CTRL tests in make check (deprecated) @@ -47,6 +65,11 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) +AC_MSG_RESULT([CFLAGS="$CFLAGS"]) +AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) +AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) + AC_OUTPUT( src/Makefile tests/Makefile -- To view, visit https://gerrit.osmocom.org/10735 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: I1666df1721ba9acc950612558e07a1a2e7b2bb85 Gerrit-Change-Number: 10735 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 Mon Sep 3 12:12:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:06 +0000 Subject: Change in osmo-sip-connector[master]: jenkins.sh: Use --enable-werror option In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10736 ) Change subject: jenkins.sh: Use --enable-werror option ...................................................................... jenkins.sh: Use --enable-werror option Change-Id: I8cfad742e6ce766b022ecdf4c78495accc9405d0 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) 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/contrib/jenkins.sh b/contrib/jenkins.sh index 0b11ef3..00cd5ff 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -27,7 +27,7 @@ set -x autoreconf --install --force -./configure --enable-vty-tests --enable-external-tests +./configure --enable-werror --enable-vty-tests --enable-external-tests $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/10736 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: I8cfad742e6ce766b022ecdf4c78495accc9405d0 Gerrit-Change-Number: 10736 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 Mon Sep 3 12:12:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:25 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10732 ) Change subject: Add CC_CAUSE value_string array ...................................................................... Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 03 Sep 2018 12:12:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 12:12:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:12:39 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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..fc3b973 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[] = { + { GSM48_CC_CAUSE_UNASSIGNED_NR, "UNASSIGNED_NR" }, + { GSM48_CC_CAUSE_NO_ROUTE, "NO_ROUTE" }, + { GSM48_CC_CAUSE_CHAN_UNACCEPT, "CHAN_UNACCEPT" }, + { GSM48_CC_CAUSE_OP_DET_BARRING, "OP_DET_BARRING" }, + { GSM48_CC_CAUSE_NORM_CALL_CLEAR, "NORM_CALL_CLEAR" }, + { GSM48_CC_CAUSE_USER_BUSY, "USER_BUSY" }, + { GSM48_CC_CAUSE_USER_NOTRESPOND, "USER_NOTRESPOND" }, + { GSM48_CC_CAUSE_USER_ALERTING_NA, "USER_ALERTING_NA" }, + { GSM48_CC_CAUSE_CALL_REJECTED, "CALL_REJECTED" }, + { GSM48_CC_CAUSE_NUMBER_CHANGED, "NUMBER_CHANGED" }, + { GSM48_CC_CAUSE_PRE_EMPTION, "PRE_EMPTION" }, + { GSM48_CC_CAUSE_NONSE_USER_CLR, "NONSE_USER_CLR" }, + { GSM48_CC_CAUSE_DEST_OOO, "DEST_OOO" }, + { GSM48_CC_CAUSE_INV_NR_FORMAT, "INV_NR_FORMAT" }, + { GSM48_CC_CAUSE_FACILITY_REJ, "FACILITY_REJ" }, + { GSM48_CC_CAUSE_RESP_STATUS_INQ, "RESP_STATUS_INQ" }, + { GSM48_CC_CAUSE_NORMAL_UNSPEC, "NORMAL_UNSPEC" }, + { GSM48_CC_CAUSE_NO_CIRCUIT_CHAN, "NO_CIRCUIT_CHAN" }, + { GSM48_CC_CAUSE_NETWORK_OOO, "NETWORK_OOO" }, + { GSM48_CC_CAUSE_TEMP_FAILURE, "TEMP_FAILURE" }, + { GSM48_CC_CAUSE_SWITCH_CONG, "SWITCH_CONG" }, + { GSM48_CC_CAUSE_ACC_INF_DISCARD, "ACC_INF_DISCARD" }, + { GSM48_CC_CAUSE_REQ_CHAN_UNAVAIL, "REQ_CHAN_UNAVAIL" }, + { GSM48_CC_CAUSE_RESOURCE_UNAVAIL, "RESOURCE_UNAVAIL" }, + { GSM48_CC_CAUSE_QOS_UNAVAIL, "QOS_UNAVAIL" }, + { GSM48_CC_CAUSE_REQ_FAC_NOT_SUBSC, "REQ_FAC_NOT_SUBSC" }, + { GSM48_CC_CAUSE_INC_BARRED_CUG, "INC_BARRED_CUG" }, + { GSM48_CC_CAUSE_BEARER_CAP_UNAUTH, "BEARER_CAP_UNAUTH" }, + { GSM48_CC_CAUSE_BEARER_CA_UNAVAIL, "BEARER_CA_UNAVAIL" }, + { GSM48_CC_CAUSE_SERV_OPT_UNAVAIL, "SERV_OPT_UNAVAIL" }, + { GSM48_CC_CAUSE_BEARERSERV_UNIMPL, "BEARERSERV_UNIMPL" }, + { GSM48_CC_CAUSE_ACM_GE_ACM_MAX, "ACM_GE_ACM_MAX" }, + { GSM48_CC_CAUSE_REQ_FAC_NOTIMPL, "REQ_FAC_NOTIMPL" }, + { GSM48_CC_CAUSE_RESTR_BCAP_AVAIL, "RESTR_BCAP_AVAIL" }, + { GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "SERV_OPT_UNIMPL" }, + { GSM48_CC_CAUSE_INVAL_TRANS_ID, "INVAL_TRANS_ID" }, + { GSM48_CC_CAUSE_USER_NOT_IN_CUG, "USER_NOT_IN_CUG" }, + { GSM48_CC_CAUSE_INCOMPAT_DEST, "INCOMPAT_DEST" }, + { GSM48_CC_CAUSE_INVAL_TRANS_NET, "INVAL_TRANS_NET" }, + { GSM48_CC_CAUSE_SEMANTIC_INCORR, "SEMANTIC_INCORR" }, + { GSM48_CC_CAUSE_INVAL_MAND_INF, "INVAL_MAND_INF" }, + { GSM48_CC_CAUSE_MSGTYPE_NOTEXIST, "MSGTYPE_NOTEXIST" }, + { GSM48_CC_CAUSE_MSGTYPE_INCOMPAT, "MSGTYPE_INCOMPAT" }, + { GSM48_CC_CAUSE_IE_NOTEXIST, "IE_NOTEXIST" }, + { GSM48_CC_CAUSE_COND_IE_ERR, "COND_IE_ERR" }, + { GSM48_CC_CAUSE_MSG_INCOMP_STATE, "MSG_INCOMP_STATE" }, + { GSM48_CC_CAUSE_RECOVERY_TIMER, "RECOVERY_TIMER" }, + { GSM48_CC_CAUSE_PROTO_ERR, "PROTO_ERR" }, + { GSM48_CC_CAUSE_INTERWORKING, "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: merged Gerrit-Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 Gerrit-Change-Number: 10732 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 Mon Sep 3 12:22:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 12:22:08 +0000 Subject: Change in libosmocore[master]: Add RSPRO support to IPA and logging definitions Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10737 Change subject: Add RSPRO support to IPA and logging definitions ...................................................................... Add RSPRO support to IPA and logging definitions Change-Id: Iee79f5273f32cb9ce4bd7a984e7f0625542e776f --- M include/osmocom/core/logging.h M include/osmocom/gsm/protocol/ipaccess.h 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/10737/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 8464043..c60143d 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -122,7 +122,8 @@ #define DLM3UA -16 /*!< Osmocom M3UA */ #define DLMGCP -17 /*!< Osmocom MGCP */ #define DLJIBUF -18 /*!< Osmocom Jitter Buffer */ -#define OSMO_NUM_DLIB 18 /*!< Number of logging sub-systems in libraries */ +#define DLRSPRO -19 /*!< Osmocom Remote SIM Protocol */ +#define OSMO_NUM_DLIB 19 /*!< Number of logging sub-systems in libraries */ /*! Configuration of single log category / sub-system */ struct log_category { diff --git a/include/osmocom/gsm/protocol/ipaccess.h b/include/osmocom/gsm/protocol/ipaccess.h index 0f5d54f..80413d1 100644 --- a/include/osmocom/gsm/protocol/ipaccess.h +++ b/include/osmocom/gsm/protocol/ipaccess.h @@ -38,6 +38,7 @@ IPAC_PROTO_EXT_ORC = 0x04, /* OML Router Control */ IPAC_PROTO_EXT_GSUP = 0x05, /* GSUP GPRS extension */ IPAC_PROTO_EXT_OAP = 0x06, /* Osmocom Authn Protocol */ + IPAC_PROTO_EXT_RSPRO = 0x07, /* Remote SIM protocol */ }; enum ipaccess_msgtype { -- To view, visit https://gerrit.osmocom.org/10737 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: Iee79f5273f32cb9ce4bd7a984e7f0625542e776f Gerrit-Change-Number: 10737 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 13:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:08:07 +0000 Subject: Change in libosmocore[master]: Add RSPRO support to IPA and logging definitions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10737 ) Change subject: Add RSPRO support to IPA and logging definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10737 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: Iee79f5273f32cb9ce4bd7a984e7f0625542e776f Gerrit-Change-Number: 10737 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 13:08: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 Sep 3 13:08:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:08:09 +0000 Subject: Change in libosmocore[master]: Add RSPRO support to IPA and logging definitions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10737 ) Change subject: Add RSPRO support to IPA and logging definitions ...................................................................... Add RSPRO support to IPA and logging definitions Change-Id: Iee79f5273f32cb9ce4bd7a984e7f0625542e776f --- M include/osmocom/core/logging.h M include/osmocom/gsm/protocol/ipaccess.h 2 files changed, 3 insertions(+), 1 deletion(-) 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 8464043..c60143d 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -122,7 +122,8 @@ #define DLM3UA -16 /*!< Osmocom M3UA */ #define DLMGCP -17 /*!< Osmocom MGCP */ #define DLJIBUF -18 /*!< Osmocom Jitter Buffer */ -#define OSMO_NUM_DLIB 18 /*!< Number of logging sub-systems in libraries */ +#define DLRSPRO -19 /*!< Osmocom Remote SIM Protocol */ +#define OSMO_NUM_DLIB 19 /*!< Number of logging sub-systems in libraries */ /*! Configuration of single log category / sub-system */ struct log_category { diff --git a/include/osmocom/gsm/protocol/ipaccess.h b/include/osmocom/gsm/protocol/ipaccess.h index 0f5d54f..80413d1 100644 --- a/include/osmocom/gsm/protocol/ipaccess.h +++ b/include/osmocom/gsm/protocol/ipaccess.h @@ -38,6 +38,7 @@ IPAC_PROTO_EXT_ORC = 0x04, /* OML Router Control */ IPAC_PROTO_EXT_GSUP = 0x05, /* GSUP GPRS extension */ IPAC_PROTO_EXT_OAP = 0x06, /* Osmocom Authn Protocol */ + IPAC_PROTO_EXT_RSPRO = 0x07, /* Remote SIM protocol */ }; enum ipaccess_msgtype { -- To view, visit https://gerrit.osmocom.org/10737 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: Iee79f5273f32cb9ce4bd7a984e7f0625542e776f Gerrit-Change-Number: 10737 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 Mon Sep 3 13:08:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:08:14 +0000 Subject: Change in osmo-mgw[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/10351 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Change-Id: I4bf7b6124c747a0cff5562187a099c33525e109e Gerrit-Change-Number: 10351 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 13:08: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 Sep 3 13:08:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:08:16 +0000 Subject: Change in osmo-mgw[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/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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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: merged Gerrit-Change-Id: I4bf7b6124c747a0cff5562187a099c33525e109e Gerrit-Change-Number: 10351 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 Mon Sep 3 13:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:19:41 +0000 Subject: Change in osmo-hlr[master]: libosmo-gsup-client: License is GPLv2-or-later Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10738 Change subject: libosmo-gsup-client: License is GPLv2-or-later ...................................................................... libosmo-gsup-client: License is GPLv2-or-later Fix the unintentional AGPLv3-or-later license header in gsup_client.c Change-Id: I6378bd59fdbe8d95cd6132a1cbc40ae29b558c42 --- M src/gsupclient/gsup_client.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/38/10738/1 diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index a7fdc5f..d34a22d 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -7,16 +7,16 @@ * 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 + * 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 Affero General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ -- To view, visit https://gerrit.osmocom.org/10738 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: I6378bd59fdbe8d95cd6132a1cbc40ae29b558c42 Gerrit-Change-Number: 10738 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 13:22:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:22:14 +0000 Subject: Change in osmo-hlr[master]: libosmo-gsup-client: License is GPLv2-or-later In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10738 ) Change subject: libosmo-gsup-client: License is GPLv2-or-later ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10738 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: I6378bd59fdbe8d95cd6132a1cbc40ae29b558c42 Gerrit-Change-Number: 10738 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 13:22: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 Sep 3 13:41:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 13:41:53 +0000 Subject: Change in osmo-hlr[master]: libosmo-gsup-client: License is GPLv2-or-later In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10738 ) Change subject: libosmo-gsup-client: License is GPLv2-or-later ...................................................................... libosmo-gsup-client: License is GPLv2-or-later Fix the unintentional AGPLv3-or-later license header in gsup_client.c Change-Id: I6378bd59fdbe8d95cd6132a1cbc40ae29b558c42 --- M src/gsupclient/gsup_client.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index a7fdc5f..d34a22d 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -7,16 +7,16 @@ * 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 + * 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 Affero General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ -- To view, visit https://gerrit.osmocom.org/10738 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: I6378bd59fdbe8d95cd6132a1cbc40ae29b558c42 Gerrit-Change-Number: 10738 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 Mon Sep 3 15:07:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:07:25 +0000 Subject: Change in osmo-trx[master]: Logger: Disable pthread cancel point inside Logger destructor Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10739 Change subject: Logger: Disable pthread cancel point inside Logger destructor ...................................................................... Logger: Disable pthread cancel point inside Logger destructor pthread_cancel is implemented in c++ using exception handlers. In destructor of Log object, the log function is called which will eventually call fputs() to write to a file. Since that function is considered a cancelation point, if pthread_cancel has been called the exception handler will start unstacking frames and calling destructors in the process. At some point this will cause a runtime exception in c++ which will call std::terminate() to abort the process. The solution is thus to avoid starting the cancellation process inside the destructor. This behavior was spotted while calling the destructor of Transceiver object in forthcoming patches. See a more detailed example here: https://skaark.wordpress.com/2010/08/26/pthread_cancel-considered-harmful/ Change-Id: I71ca90f3fbc73df58b878a03361f7b7831d838b4 --- M CommonLibs/Logger.cpp 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/39/10739/1 diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp index 393d882..171c635 100644 --- a/CommonLibs/Logger.cpp +++ b/CommonLibs/Logger.cpp @@ -44,6 +44,8 @@ Log::~Log() { + int old_state; + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state); int mlen = mStream.str().size(); int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n'); const char *fmt = neednl ? "%s\n" : "%s"; @@ -51,6 +53,7 @@ // The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers, // so just use std::cout. LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str()); + pthread_setcancelstate(old_state, NULL); } ostringstream& Log::get() -- To view, visit https://gerrit.osmocom.org/10739 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: I71ca90f3fbc73df58b878a03361f7b7831d838b4 Gerrit-Change-Number: 10739 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 Sep 3 15:07:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:07:26 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10740 Change subject: cosmetic: Fix trailing whitespace ...................................................................... cosmetic: Fix trailing whitespace Change-Id: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 4 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/40/10740/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 881cfb7..15d5929 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -562,8 +562,8 @@ *underrun = false; for (i = 0; isetPriority(prio); } - /** get transport window type of attached device */ + /** get transport window type of attached device */ enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); } /** Minimum latency that the device can achieve */ 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 * -- To view, visit https://gerrit.osmocom.org/10740 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: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 Gerrit-Change-Number: 10740 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 Sep 3 15:07:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:07:26 +0000 Subject: Change in osmo-trx[master]: radioInterface: forward errors from RadioDevice to Transceiver in rec... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10741 Change subject: radioInterface: forward errors from RadioDevice to Transceiver in recv path ...................................................................... radioInterface: forward errors from RadioDevice to Transceiver in recv path Change-Id: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9 --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp 4 files changed, 22 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/41/10741/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index f74897f..b9c6672 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -218,14 +218,15 @@ while (pushBuffer()); } -bool RadioInterface::driveReceiveRadio() +int RadioInterface::driveReceiveRadio() { radioVector *burst = NULL; if (!mOn) - return false; + return 0; - pullBuffer(); + if (pullBuffer() < 0) + return -1; GSM::Time rcvClock = mClock.get(); rcvClock.decTN(receiveOffset); @@ -270,7 +271,7 @@ burstSize = (symbolsPerSlot + (tN % 4 == 0)) * mSPSRx; } - return true; + return 1; } bool RadioInterface::isUnderrun() @@ -300,13 +301,13 @@ } /* Receive a timestamped chunk from the device */ -void RadioInterface::pullBuffer() +int RadioInterface::pullBuffer() { bool local_underrun; size_t numRecv, segmentLen = recvBuffer[0]->getSegmentLen(); if (recvBuffer[0]->getFreeSegments() <= 0) - return; + return -1; /* Outer buffer access size is fixed */ numRecv = mRadio->readSamples(convertRecvBuffer, @@ -317,7 +318,7 @@ if (numRecv != segmentLen) { LOG(ALERT) << "Receive error " << numRecv; - return; + return -1; } for (size_t i = 0; i < mChans; i++) { @@ -328,6 +329,7 @@ underrun |= local_underrun; readTimestamp += numRecv; + return 0; } /* Send timestamped chunk to the device with arbitrary size */ diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 54ffc31..f19a8dc 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -71,7 +71,7 @@ virtual bool pushBuffer(void); /** pull GSM bursts from the receive buffer */ - virtual void pullBuffer(void); + virtual int pullBuffer(void); public: @@ -116,8 +116,8 @@ void driveTransmitRadio(std::vector &bursts, std::vector &zeros); - /** drive reception of GSM bursts */ - bool driveReceiveRadio(); + /** drive reception of GSM bursts. -1: Error. 0: Radio off. 1: Received something. */ + int driveReceiveRadio(); int setPowerAttenuation(int atten, size_t chan = 0); @@ -149,7 +149,7 @@ signalVector *outerRecvBuffer; bool pushBuffer(); - void pullBuffer(); + int pullBuffer(); public: RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps); @@ -162,7 +162,7 @@ class RadioInterfaceMulti : public RadioInterface { private: bool pushBuffer(); - void pullBuffer(); + int pullBuffer(); signalVector *outerSendBuffer; signalVector *outerRecvBuffer; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index b3add21..67ccb25 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -225,14 +225,14 @@ } /* Receive a timestamped chunk from the device */ -void RadioInterfaceMulti::pullBuffer() +int RadioInterfaceMulti::pullBuffer() { bool local_underrun; size_t num; float *buf; if (recvBuffer[0]->getFreeSegments() <= 0) - return; + return -1; /* Outer buffer access size is fixed */ num = mRadio->readSamples(convertRecvBuffer, @@ -242,7 +242,7 @@ &local_underrun); if (num != channelizer->inputLen()) { LOG(ALERT) << "Receive error " << num << ", " << channelizer->inputLen(); - return; + return -1; } convert_short_float((float *) outerRecvBuffer->begin(), @@ -288,6 +288,7 @@ LOG(ALERT) << "Sample rate upsampling error"; } } + return 0; } /* Send a timestamped chunk to the device */ diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp index b0f799e..8ae4aa1 100644 --- a/Transceiver52M/radioInterfaceResamp.cpp +++ b/Transceiver52M/radioInterfaceResamp.cpp @@ -160,13 +160,13 @@ } /* Receive a timestamped chunk from the device */ -void RadioInterfaceResamp::pullBuffer() +int RadioInterfaceResamp::pullBuffer() { bool local_underrun; int rc, num_recv; if (recvBuffer[0]->getFreeSegments() <= 0) - return; + return -1; /* Outer buffer access size is fixed */ num_recv = mRadio->readSamples(convertRecvBuffer, @@ -176,7 +176,7 @@ &local_underrun); if (num_recv != (int) resamp_outchunk) { LOG(ALERT) << "Receive error " << num_recv; - return; + return -1; } convert_short_float((float *) outerRecvBuffer->begin(), @@ -196,6 +196,7 @@ /* Set history for the next chunk */ outerRecvBuffer->updateHistory(); + return 0; } /* Send a timestamped chunk to the device */ -- To view, visit https://gerrit.osmocom.org/10741 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: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9 Gerrit-Change-Number: 10741 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 Sep 3 15:07:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:07:27 +0000 Subject: Change in osmo-trx[master]: lms: Return error on device read timeout Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10742 Change subject: lms: Return error on device read timeout ...................................................................... lms: Return error on device read timeout If LImeSDR device is unplugged or its fw crashes during operation, reading from the device will fail and will first receive short reads and finally 0 byte reads. Let's quickly notify these events to upper layers instead of trying to process the buffer and checking timestamps for something we know it's already not useful. Related: OS#3340 Change-Id: Ib1af8cdd6cdadf581b039882add4049eea45a0f7 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/10742/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 15d5929..9ba5ce3 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -511,11 +511,13 @@ for (i = 0; i m_last_rx_underruns[i]) -- To view, visit https://gerrit.osmocom.org/10742 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: Ib1af8cdd6cdadf581b039882add4049eea45a0f7 Gerrit-Change-Number: 10742 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 Sep 3 15:07:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:07:27 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10743 Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error Transceiver::stop() can only be called from either CTRL iface thread or from main thread (running osmocom loop). That's because stop attempts to cancel and then join all the other threads, which would then lock if attempting to stop from some of them. As a result, the best option is to indicate to the user of the transceiver option (osmo-trx.cpp) to stop it in a correct fashion by destroying the object from the main thread. Change-Id: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 --- M CommonLibs/Makefile.am A CommonLibs/osmo_signal.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 81 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/43/10743/1 diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 2332acb..3173397 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -49,4 +49,5 @@ Logger.h \ trx_vty.h \ debug.h \ + osmo_signal.h \ config_defs.h diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h new file mode 100644 index 0000000..4d201d3 --- /dev/null +++ b/CommonLibs/osmo_signal.h @@ -0,0 +1,37 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ +/* Generic signalling/notification infrastructure */ + +#pragma once + +#include + +/* + * Signalling subsystems + */ +enum signal_subsystems { + SS_TRANSC, +}; + +/* SS_TRANSC signals */ +enum SS_TRANSC { + S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be stopped */ +}; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index a1ebb30..d827adb 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -27,6 +27,10 @@ #include "Transceiver.h" #include +extern "C" { +#include "osmo_signal.h" +} + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -115,7 +119,7 @@ : mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress), mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100), mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface), - rssiOffset(wRssiOffset), + rssiOffset(wRssiOffset), sig_cbfn(NULL), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false), mForceClockInterface(false), mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0), mMaxExpectedDelayNB(0), mWriteBurstToDiskMask(0) @@ -219,6 +223,17 @@ return true; } +void Transceiver::setSignalHandler(osmo_signal_cbfn cbfn) +{ + if(this->sig_cbfn) + osmo_signal_unregister_handler(SS_TRANSC, this->sig_cbfn, NULL); + + if(cbfn) { + this->sig_cbfn = cbfn; + osmo_signal_register_handler(SS_TRANSC, this->sig_cbfn, NULL); + } +} + /* * Start the transceiver * @@ -885,8 +900,12 @@ void Transceiver::driveReceiveRadio() { - if (!mRadioInterface->driveReceiveRadio()) { + int rc = mRadioInterface->driveReceiveRadio(); + if (rc == 0) { usleep(100000); + } else if (rc < 0) { + LOG(FATAL) << "radio Interface receive failed, requesting stop."; + osmo_signal_dispatch(SS_TRANSC, S_TRANSC_STOP_REQUIRED, this); } else if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) { mForceClockInterface = false; writeClockInterface(); diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index f9b54f0..e250adc 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -31,6 +31,7 @@ #include extern "C" { +#include #include "config_defs.h" } @@ -128,6 +129,8 @@ /** accessor for number of channels */ size_t numChans() const { return mChans; }; + void setSignalHandler(osmo_signal_cbfn cbfn); + /** Codes for channel combinations */ typedef enum { FILL, ///< Channel is transmitted, but unused @@ -177,6 +180,8 @@ double rssiOffset; ///< RSSI to dBm conversion offset + osmo_signal_cbfn *sig_cbfn; ///< Registered Signal Handler to announce events. + /** modulate and add a burst to the transmit queue */ void addRadioVector(size_t chan, BitVector &bits, int RSSI, GSM::Time &wTime); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 1c40fcf..d01a4cf 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -55,6 +55,7 @@ #include "convert.h" #include "trx_vty.h" #include "debug.h" +#include "osmo_signal.h" } #define DEFAULT_CONFIG_FILE "osmo-trx.cfg" @@ -112,6 +113,20 @@ return radio; } +/* Callback function to be called every time we receive a signal from TRANSC */ +static int transc_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + switch (signal) { + case S_TRANSC_STOP_REQUIRED: + gshutdown = true; + break; + default: + break; + } + return 0; +} + /* Create transceiver core * The multi-threaded modem core operates at multiples of the GSM rate of * 270.8333 ksps and consists of GSM specific modulation, demodulation, @@ -132,6 +147,8 @@ return -1; } + transceiver->setSignalHandler(transc_sig_cb); + for (size_t i = 0; i < trx->cfg.num_chans; i++) { fifo = radio->receiveFIFO(i); if (fifo && transceiver->receiveFIFO(fifo, i)) -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 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 Sep 3 15:07:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:07:27 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix variable storing integer return value Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10744 Change subject: radioInterface: Fix variable storing integer return value ...................................................................... radioInterface: Fix variable storing integer return value Change-Id: I0a0a06a6d16a228cfcb7bd746bab2d79f10ce244 --- M Transceiver52M/radioInterface.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/44/10744/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index b9c6672..7d6a03b 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -304,7 +304,8 @@ int RadioInterface::pullBuffer() { bool local_underrun; - size_t numRecv, segmentLen = recvBuffer[0]->getSegmentLen(); + int numRecv; + size_t segmentLen = recvBuffer[0]->getSegmentLen(); if (recvBuffer[0]->getFreeSegments() <= 0) return -1; @@ -316,7 +317,7 @@ readTimestamp, &local_underrun); - if (numRecv != segmentLen) { + if ((size_t) numRecv != segmentLen) { LOG(ALERT) << "Receive error " << numRecv; return -1; } -- To view, visit https://gerrit.osmocom.org/10744 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: I0a0a06a6d16a228cfcb7bd746bab2d79f10ce244 Gerrit-Change-Number: 10744 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 Sep 3 15:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 15:48:59 +0000 Subject: Change in osmo-trx[master]: Logger: Disable pthread cancel point inside Logger destructor In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10739 ) Change subject: Logger: Disable pthread cancel point inside Logger destructor ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10739 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: I71ca90f3fbc73df58b878a03361f7b7831d838b4 Gerrit-Change-Number: 10739 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 15:48:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:50:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:50:02 +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 ...................................................................... Set Ready For Review -- 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: Mon, 03 Sep 2018 15:50:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:50:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 15:50:30 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10740 ) Change subject: cosmetic: Fix trailing whitespace ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10740/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10740/1//COMMIT_MSG at 7 PS1, Line 7: cosmetic: Fix trailing whitespace you're also moving the order of log / pthread related statements, I'm sure this is on purpose? Is that still cosmetic? doesn't it deserve to be mentioned here? -- To view, visit https://gerrit.osmocom.org/10740 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: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 Gerrit-Change-Number: 10740 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 03 Sep 2018 15:50:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:50:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:50:31 +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: Tested with osmo-trx-lms and a LimeSDR-usb, I could register and place a call without issues, sound looks fine. -- 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: Mon, 03 Sep 2018 15:50:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:50:39 +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 ...................................................................... Set Ready For Review -- 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: Mon, 03 Sep 2018 15:50:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:50:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:50:42 +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: Tested with osmo-trx-lms and a LimeSDR-usb, I could register and place a call without issues, sound looks fine. -- 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: Mon, 03 Sep 2018 15:50:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:52:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 15:52:58 +0000 Subject: Change in osmo-trx[master]: radioInterface: forward errors from RadioDevice to Transceiver in rec... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10741 ) Change subject: radioInterface: forward errors from RadioDevice to Transceiver in recv path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10741 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: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9 Gerrit-Change-Number: 10741 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 15: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 Mon Sep 3 15:53:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 15:53:32 +0000 Subject: Change in osmo-trx[master]: lms: Return error on device read timeout In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10742 ) Change subject: lms: Return error on device read timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10742 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: Ib1af8cdd6cdadf581b039882add4049eea45a0f7 Gerrit-Change-Number: 10742 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 15:53:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:54:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 15:54:01 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10740 ) Change subject: cosmetic: Fix trailing whitespace ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10740/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10740/1//COMMIT_MSG at 7 PS1, Line 7: cosmetic: Fix trailing whitespace > you're also moving the order of log / pthread related statements, I'm sure this is on purpose? Is t [?] Good catch, I actually though it was part of the trailing whitspace stuff while looking at the changes since I didn't see any line content being changed. Since commit https://gerrit.osmocom.org/#/c/osmo-trx/+/10739/ comes before, this change doesn't really matter. -- To view, visit https://gerrit.osmocom.org/10740 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: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 Gerrit-Change-Number: 10740 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 03 Sep 2018 15:54:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:56:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 15:56:41 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10743 ) Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... Patch Set 1: Code-Review+1 (1 comment) fine except for cosmetics https://gerrit.osmocom.org/#/c/10743/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/10743/1/Transceiver52M/Transceiver.cpp at 228 PS1, Line 228: if(this->sig_cbfn) where does this coding style come from? if is not a function ,and even existing code in this file doesn't seem to use this style? SCNR. -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 15:56:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 15:56:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Sep 2018 15:56:57 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix variable storing integer return value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10744 ) Change subject: radioInterface: Fix variable storing integer return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10744 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: I0a0a06a6d16a228cfcb7bd746bab2d79f10ce244 Gerrit-Change-Number: 10744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Sep 2018 15:56:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 16:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 16:00:00 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10743 ) Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10743/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/10743/1/Transceiver52M/Transceiver.cpp at 228 PS1, Line 228: if(this->sig_cbfn) > where does this coding style come from? if is not a function ,and even existing code in this file do [?] that's one of my usual coding style typos, I'll fix them. -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 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, 03 Sep 2018 16:00:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 16:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 16:56:17 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10740 to look at the new patch set (#2). Change subject: cosmetic: Fix trailing whitespace ...................................................................... cosmetic: Fix trailing whitespace Change-Id: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/40/10740/2 -- To view, visit https://gerrit.osmocom.org/10740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 Gerrit-Change-Number: 10740 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) 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 Sep 3 16:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 16:56:17 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... 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/10743 to look at the new patch set (#2). Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error Transceiver::stop() can only be called from either CTRL iface thread or from main thread (running osmocom loop). That's because stop attempts to cancel and then join all the other threads, which would then lock if attempting to stop from some of them. As a result, the best option is to indicate to the user of the transceiver option (osmo-trx.cpp) to stop it in a correct fashion by destroying the object from the main thread. Change-Id: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 --- M CommonLibs/Makefile.am A CommonLibs/osmo_signal.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 81 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/43/10743/2 -- To view, visit https://gerrit.osmocom.org/10743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 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 Mon Sep 3 17:03:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Sep 2018 17:03:28 +0000 Subject: Change in osmo-trx[master]: configure.ac: Specify default language as C++ Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10745 Change subject: configure.ac: Specify default language as C++ ...................................................................... configure.ac: Specify default language as C++ This is useful if we add more AC_CHECK_HEADER or similar configure tests including C++ header files or required C++ features, since otherwise gcc is used by default and test fail. Change-Id: Iee757c78b72290c5d2a4c31339800a4e72b6be23 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/10745/1 diff --git a/configure.ac b/configure.ac index e1cc121..daa8677 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,7 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PATH_PROG([RM_PROG], [rm]) +AC_LANG([C++]) dnl check for pkg-config (explained in detail in libosmocore/configure.ac) AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) -- To view, visit https://gerrit.osmocom.org/10745 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: Iee757c78b72290c5d2a4c31339800a4e72b6be23 Gerrit-Change-Number: 10745 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 Sep 3 17:15:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Sep 2018 17:15:33 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10743 ) Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10743/2/CommonLibs/osmo_signal.h File CommonLibs/osmo_signal.h: https://gerrit.osmocom.org/#/c/10743/2/CommonLibs/osmo_signal.h at 21 PS2, Line 21: /* Generic signalling/notification infrastructure */ Makes sense to move this line to the top, just before the copyright statement as we do in other files. https://gerrit.osmocom.org/#/c/10743/2/CommonLibs/osmo_signal.h at 28 PS2, Line 28: * Signalling subsystems cosmetic: this is a single line comment -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Sep 2018 17:15:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 18:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 18:53: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: what? :) Ok, to put it differently, if you see code like this: x.foo = {}; x.bar = 1; x.baz = 5; memset(&x.foo, 0, sizeof(x.foo)); and you remove the final memset because x.foo was already cleared before, that for me constitutes a cosmetic code change. We can agree at least that there is absolutely no functional difference!? -- 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: Mon, 03 Sep 2018 18:53:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 18:54:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 18:54:29 +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: actually, I don't understand why this tiny patch is any concern at all. Can we get over this plz? -- 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: Mon, 03 Sep 2018 18:54:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 19:13:38 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 3 Sep 2018 19:13:38 +0000 Subject: Change in simtrace2[master]: stdio: fix detection of malformated format strings In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/10671 ) Change subject: stdio: fix detection of malformated format strings ...................................................................... Patch Set 1: you are right. I misunderstood how the va_ macros work. -- 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-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Sep 2018 19:13:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 19:13:57 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 3 Sep 2018 19:13:57 +0000 Subject: Change in simtrace2[master]: stdio: fix detection of malformated format strings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10671 to look at the new patch set (#2). 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, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/71/10671/2 -- 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: newpatchset Gerrit-Change-Id: I8506b05d56da55d1357a1234917adf341b46e1db Gerrit-Change-Number: 10671 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively 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/10677 to look at the new patch set (#3). 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. Cosmetic: use strcmp(), not strncmp(). In the presence of a terminating nul as we can assume here, this makes no functional difference, but it clarifies the code. 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, 57 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/77/10677/3 -- 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: newpatchset Gerrit-Change-Id: I8e52278c3abe9e9c8c848c2b1538bce443f68a43 Gerrit-Change-Number: 10677 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 Mon Sep 3 21:13:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): match conn Id ('I:') despite leading zeros 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/10678 to look at the new patch set (#3). 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/3 -- 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: newpatchset Gerrit-Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 Gerrit-Change-Number: 10678 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 Mon Sep 3 21:13:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: cosmetically re-arrange reply_to() args Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10746 Change subject: mgcp_client_test: cosmetically re-arrange reply_to() args ...................................................................... mgcp_client_test: cosmetically re-arrange reply_to() args I want to test arbitrary length Conn IDs ('I:'), and hence don't want to pass the conn_id as int, but rather just include it in the message string. Prepare for that by eliminating the extra conn_id arg and just pass a params string. Change-Id: Ib2e718dda3aa1f6e9979dee823d973dd002e2318 --- M tests/mgcp_client/mgcp_client_test.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/46/10746/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 2662fc1..84ba3b4 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -77,14 +77,14 @@ struct mgcp_client *mgcp = NULL; static int reply_to(mgcp_trans_id_t trans_id, int code, const char *comment, - int conn_id, const char *params) + const char *params) { static char compose[4096 - 128]; int len; len = snprintf(compose, sizeof(compose), - "%d %u %s\r\nI: %d\n\n%s", - code, trans_id, comment, conn_id, params); + "%d %u %s\r\n%s", + code, trans_id, comment, params); OSMO_ASSERT(len < sizeof(compose)); OSMO_ASSERT(len > 0); @@ -148,7 +148,8 @@ msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); trans_id = dummy_mgcp_send(msg); - reply_to(trans_id, 200, "OK", 1, + reply_to(trans_id, 200, "OK", + "I: 1\n\n" "v=0\r\n" "o=- 1 23 IN IP4 10.9.1.120\r\n" "s=-\r\n" @@ -335,7 +336,7 @@ OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == 0); fprintf(stderr, "- late response gets discarded\n"); - OSMO_ASSERT(reply_to(trans_id, 200, "OK", 1, "v=0\r\n") == -ENOENT); + OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\n\nv=0\r\n") == -ENOENT); fprintf(stderr, "- canceling again does nothing\n"); OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == -ENOENT); -- To view, visit https://gerrit.osmocom.org/10746 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: Ib2e718dda3aa1f6e9979dee823d973dd002e2318 Gerrit-Change-Number: 10746 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: use "\r\n\r\n" instead of "\n\n" Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10747 Change subject: mgcp_client_test: use "\r\n\r\n" instead of "\n\n" ...................................................................... mgcp_client_test: use "\r\n\r\n" instead of "\n\n" The separator between MGCP and SDP section is typically "\r\n\r\n". For some reason the test so far used "\n\n" instead, rather use the standard separator. Change-Id: I41c73722e5fae00663bcf96de0b57b7155809a06 --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/47/10747/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 84ba3b4..4e7e0a7 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -149,7 +149,7 @@ trans_id = dummy_mgcp_send(msg); reply_to(trans_id, 200, "OK", - "I: 1\n\n" + "I: 1\r\n\r\n" "v=0\r\n" "o=- 1 23 IN IP4 10.9.1.120\r\n" "s=-\r\n" @@ -336,7 +336,7 @@ OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == 0); fprintf(stderr, "- late response gets discarded\n"); - OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\n\nv=0\r\n") == -ENOENT); + OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\r\n\r\nv=0\r\n") == -ENOENT); fprintf(stderr, "- canceling again does nothing\n"); OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == -ENOENT); diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 58c4b82..4b1e78c 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -11,8 +11,8 @@ composed response: ----- 200 1 OK -I: 1 - +I: 1 + v=0 o=- 1 23 IN IP4 10.9.1.120 s=- @@ -141,8 +141,8 @@ composed response: ----- 200 1 OK -I: 1 - +I: 1 + v=0 ----- -- To view, visit https://gerrit.osmocom.org/10747 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: I41c73722e5fae00663bcf96de0b57b7155809a06 Gerrit-Change-Number: 10747 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: also verify received conn_id Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10748 Change subject: mgcp_client_test: also verify received conn_id ...................................................................... mgcp_client_test: also verify received conn_id Include the parsed conn_id in the response cb printout to verify them in mgcp_client_test.ok. Change-Id: I6b9b18d4d0867febd75a4d29f8a2fcdf0553ae4c --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/48/10748/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 4e7e0a7..74ed53e 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -102,6 +102,7 @@ printf("response cb received:\n"); printf(" head.response_code = %d\n", response->head.response_code); printf(" head.trans_id = %u\n", response->head.trans_id); + printf(" head.conn_id = %s\n", response->head.conn_id); printf(" head.comment = %s\n", response->head.comment); printf(" audio_port = %u\n", response->audio_port); printf(" audio_ip = %s\n", response->audio_ip); diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 4b1e78c..5e14219 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -27,6 +27,7 @@ response cb received: head.response_code = 200 head.trans_id = 1 + head.conn_id = 1 head.comment = OK audio_port = 16002 audio_ip = 10.9.1.120 -- To view, visit https://gerrit.osmocom.org/10748 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: I6b9b18d4d0867febd75a4d29f8a2fcdf0553ae4c Gerrit-Change-Number: 10748 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: test long conn_id Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10749 Change subject: mgcp_client_test: test long conn_id ...................................................................... mgcp_client_test: test long conn_id Add a full length (32 characters according to spec) conn ID in a CRCX response, as well as a too long one. The too long one is currently silently truncated, a subsequent patch will improve on that (If2a1aab1f13e771a6705c430e3c75bd42477a23b). Change-Id: I5f2d52f086ea2d330fcce88a176488ace972bf79 --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 2 files changed, 140 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/49/10749/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 74ed53e..e6982e4 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -162,6 +162,60 @@ "a=ptime:20\r\n"); } +void test_crcx_long_conn_id(void) +{ + struct msgb *msg; + mgcp_trans_id_t trans_id; + + printf("\n===== %s =====\n", __func__); + + if (mgcp) + talloc_free(mgcp); + mgcp = mgcp_client_init(ctx, &conf); + + msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); + trans_id = dummy_mgcp_send(msg); + + reply_to(trans_id, 200, "OK", + "I: 123456789abcdef0123456789ABCDEF0\r\n\r\n" + "v=0\r\n" + "o=- 1 23 IN IP4 10.9.1.120\r\n" + "s=-\r\n" + "c=IN IP4 10.9.1.120\r\n" + "t=0 0\r\n" + "m=audio 16002 RTP/AVP 110 96\r\n" + "a=rtpmap:110 AMR/8000\r\n" + "a=rtpmap:96 GSM-EFR/8000\r\n" + "a=ptime:20\r\n"); +} + +void test_crcx_too_long_conn_id(void) +{ + struct msgb *msg; + mgcp_trans_id_t trans_id; + + printf("\n===== %s =====\n", __func__); + + if (mgcp) + talloc_free(mgcp); + mgcp = mgcp_client_init(ctx, &conf); + + msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); + trans_id = dummy_mgcp_send(msg); + + reply_to(trans_id, 200, "OK", + "I: 123456789abcdef0123456789ABCDEF01001029\r\n\r\n" + "v=0\r\n" + "o=- 1 23 IN IP4 10.9.1.120\r\n" + "s=-\r\n" + "c=IN IP4 10.9.1.120\r\n" + "t=0 0\r\n" + "m=audio 16002 RTP/AVP 110 96\r\n" + "a=rtpmap:110 AMR/8000\r\n" + "a=rtpmap:96 GSM-EFR/8000\r\n" + "a=ptime:20\r\n"); +} + void test_mgcp_msg(void) { struct msgb *msg; @@ -570,6 +624,8 @@ test_sdp_section_start(); test_map_codec_to_pt_and_map_pt_to_codec(); test_map_pt_to_codec(); + test_crcx_long_conn_id(); + test_crcx_too_long_conn_id(); printf("Done\n"); fprintf(stderr, "Done\n"); diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 5e14219..aedb247 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -196,4 +196,88 @@ 2 <= 2 100 <= 100 + +===== test_crcx_long_conn_id ===== +composed: +----- +CRCX 1 17 at mgw MGCP 1.0 +C: 2a +L: p:20, a:AMR, nt:IN +M: loopback + +----- +composed response: +----- +200 1 OK +I: 123456789abcdef0123456789ABCDEF0 + +v=0 +o=- 1 23 IN IP4 10.9.1.120 +s=- +c=IN IP4 10.9.1.120 +t=0 0 +m=audio 16002 RTP/AVP 110 96 +a=rtpmap:110 AMR/8000 +a=rtpmap:96 GSM-EFR/8000 +a=ptime:20 + +----- +response cb received: + head.response_code = 200 + head.trans_id = 1 + head.conn_id = 123456789abcdef0123456789ABCDEF0 + head.comment = OK + audio_port = 16002 + audio_ip = 10.9.1.120 + ptime = 20 + codecs_len = 2 + codecs[0] = 112 + codecs[1] = 110 + ptmap_len = 2 + ptmap[0].codec = 112 + ptmap[0].pt = 110 + ptmap[1].codec = 110 + ptmap[1].pt = 96 + +===== test_crcx_too_long_conn_id ===== +composed: +----- +CRCX 1 17 at mgw MGCP 1.0 +C: 2a +L: p:20, a:AMR, nt:IN +M: loopback + +----- +composed response: +----- +200 1 OK +I: 123456789abcdef0123456789ABCDEF01001029 + +v=0 +o=- 1 23 IN IP4 10.9.1.120 +s=- +c=IN IP4 10.9.1.120 +t=0 0 +m=audio 16002 RTP/AVP 110 96 +a=rtpmap:110 AMR/8000 +a=rtpmap:96 GSM-EFR/8000 +a=ptime:20 + +----- +response cb received: + head.response_code = 200 + head.trans_id = 1 + head.conn_id = 123456789abcdef0123456789ABCDEF0 + head.comment = OK + audio_port = 16002 + audio_ip = 10.9.1.120 + ptime = 20 + codecs_len = 2 + codecs[0] = 112 + codecs[1] = 110 + ptmap_len = 2 + ptmap[0].codec = 112 + ptmap[0].pt = 110 + ptmap[1].codec = 110 + ptmap[1].pt = 96 Done -- To view, visit https://gerrit.osmocom.org/10749 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: I5f2d52f086ea2d330fcce88a176488ace972bf79 Gerrit-Change-Number: 10749 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: error on too long conn id Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10750 Change subject: mgcp_client: error on too long conn id ...................................................................... mgcp_client: error on too long conn id Instead of just silently truncating the conn ID if it is too long, rather verify its length and return an error where applicable. Adjust expected test output. Change-Id: If2a1aab1f13e771a6705c430e3c75bd42477a23b --- M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.err M tests/mgcp_client/mgcp_client_test.ok 3 files changed, 11 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/10750/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index e9d7b3f..2a8cc15 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -550,6 +550,7 @@ char label, const char *line) { char label_string[4]; + size_t rc; /* Detect empty parameters */ if (strlen(line) < 4) @@ -562,7 +563,14 @@ /* Copy payload part of the string to destinations (the label string * is always 3 chars long) */ - osmo_strlcpy(result, line + 3, result_len); + rc = osmo_strlcpy(result, line + 3, result_len); + if (rc >= result_len) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse MGCP response (parameter label: %c):" + " the received conn ID is too long: %zu, maximum is %u characters\n", + label, rc, result_len - 1); + return -ENOSPC; + } return 0; response_parse_failure: diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index 1d5a1a0..b20f93f 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -66,4 +66,6 @@ DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 +DLMGCP Failed to parse MGCP response (parameter label: I): the received conn ID is too long: 39, maximum is 32 characters +DLMGCP Cannot parse MGCP response (head parameters) Done diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index aedb247..40e32ba 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -264,20 +264,4 @@ a=ptime:20 ----- -response cb received: - head.response_code = 200 - head.trans_id = 1 - head.conn_id = 123456789abcdef0123456789ABCDEF0 - head.comment = OK - audio_port = 16002 - audio_ip = 10.9.1.120 - ptime = 20 - codecs_len = 2 - codecs[0] = 112 - codecs[1] = 110 - ptmap_len = 2 - ptmap[0].codec = 112 - ptmap[0].pt = 110 - ptmap[1].codec = 110 - ptmap[1].pt = 96 Done -- To view, visit https://gerrit.osmocom.org/10750 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: If2a1aab1f13e771a6705c430e3c75bd42477a23b Gerrit-Change-Number: 10750 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_common: rename to MGCP_CONN_ID_MAXLEN Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10751 Change subject: mgcp_common: rename to MGCP_CONN_ID_MAXLEN ...................................................................... mgcp_common: rename to MGCP_CONN_ID_MAXLEN So far, MGCP_CONN_ID_LENGTH was often used as exactly the length of the Connection Identifier. To indicate this length as a maximum, introduce the MGCP_CONN_ID_MAXLEN and use it everywhere. Keep the old name as an alias. Change-Id: I1117003c7614e98535d5c201d002e459c01bdc3f --- M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_internal.h M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client_fsm.c M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_msg.c 6 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/51/10751/1 diff --git a/include/osmocom/mgcp/mgcp_common.h b/include/osmocom/mgcp/mgcp_common.h index b2c7370..a658f1c 100644 --- a/include/osmocom/mgcp/mgcp_common.h +++ b/include/osmocom/mgcp/mgcp_common.h @@ -79,9 +79,12 @@ /* Maximum length of the comment field */ #define MGCP_COMMENT_MAXLEN 256 -/* String length of Connection Identifiers - * (see also RFC3435 2.1.3.2 Names of Connections) */ -#define MGCP_CONN_ID_LENGTH 32+1 +/* Maximum allowed String length of Connection Identifiers as per spec + * (see also RFC3435 2.1.3.2 Names of Connections), plus one for '\0'. */ +#define MGCP_CONN_ID_MAXLEN 32+1 + +/* Deprecated: old name of MGCP_CONN_ID_MAXLEN. */ +#define MGCP_CONN_ID_LENGTH MGCP_CONN_ID_MAXLEN /* String length of Endpoint Identifiers. / (see also RFC3435 section 3.2.1.3) */ diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 06883dd..f75ae8b 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -226,7 +226,7 @@ enum mgcp_connection_mode mode_orig; /*! connection id to identify the connection */ - char id[MGCP_CONN_ID_LENGTH]; + char id[MGCP_CONN_ID_MAXLEN]; /*! human readable name (vty, logging) */ char name[256]; diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 6c478e8..79f2078 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -60,7 +60,7 @@ int response_code; mgcp_trans_id_t trans_id; char comment[MGCP_COMMENT_MAXLEN]; - char conn_id[MGCP_CONN_ID_LENGTH]; + char conn_id[MGCP_CONN_ID_MAXLEN]; char endpoint[MGCP_ENDPOINT_MAXLEN]; }; diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 5368ec3..da900c5 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -41,7 +41,7 @@ bool mgw_trans_pending; /* Connection ID which has been assigned by he MGW */ - char conn_id[MGCP_CONN_ID_LENGTH]; + char conn_id[MGCP_CONN_ID_MAXLEN]; /* Local RTP connection info, the MGW will send outgoing traffic to the * ip/port specified here. The Address does not have to be choosen right diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 3a5db0f..2a45b81 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -78,7 +78,7 @@ /* ensure that the generated conn_id is unique * for this endpoint */ if (!mgcp_conn_get_rtp(endp, id_hex)) { - osmo_strlcpy(id, id_hex, MGCP_CONN_ID_LENGTH); + osmo_strlcpy(id, id_hex, MGCP_CONN_ID_MAXLEN); return 0; } } diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a7c8b47..49d0380 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -450,7 +450,7 @@ } /* Check for over long connection identifiers */ - if (strlen(conn_id) > MGCP_CONN_ID_LENGTH) { + if (strlen(conn_id) > MGCP_CONN_ID_MAXLEN) { LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n", ENDPOINT_NUMBER(endp), conn_id); -- To view, visit https://gerrit.osmocom.org/10751 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: I1117003c7614e98535d5c201d002e459c01bdc3f Gerrit-Change-Number: 10751 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:45 +0000 Subject: Change in osmo-mgw[master]: doc: fix mgcp_verify_ci() return val doc Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10752 Change subject: doc: fix mgcp_verify_ci() return val doc ...................................................................... doc: fix mgcp_verify_ci() return val doc Match the '\returns' doc to the actual implementation. Change-Id: I6f89abd56ffcda8ba0276db1bc3381fa372e35a4 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/10752/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 49d0380..c4e66ff 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -430,7 +430,8 @@ /*! Check if the specified connection id seems plausible. * \param[in] endp pointer to endpoint * \param{in] connection id to verify - * \returns 1 when connection id seems plausible, 0 on error */ + * \returns 0 when connection id is valid and exists, nozero on error. + */ int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id) { /* Check for null identifiers */ -- To view, visit https://gerrit.osmocom.org/10752 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: I6f89abd56ffcda8ba0276db1bc3381fa372e35a4 Gerrit-Change-Number: 10752 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_verify_ci(): return meaningful error codes Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10753 Change subject: mgcp_verify_ci(): return meaningful error codes ...................................................................... mgcp_verify_ci(): return meaningful error codes Instead of just -1, return RFC3435 error codes that can be used to compose a FAIL message response. Note that the return value stays compatible in that it returns 0 on a valid Connection Identifier, nonzero otherwise. The idea is to be able to distinguish between "Conn ID not found" and "Conn ID invalid" in mgcp_test.c's expected output, in upcoming change I8d6cc96be252bb486e94f343a8c7cae641ff9429. Change-Id: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6 --- M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/53/10753/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index c4e66ff..f732158 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -430,16 +430,19 @@ /*! Check if the specified connection id seems plausible. * \param[in] endp pointer to endpoint * \param{in] connection id to verify - * \returns 0 when connection id is valid and exists, nozero on error. + * \returns 0 when connection id is valid and exists, an RFC3435 error code on error. */ int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id) { + /* For invalid conn_ids, return 510 "The transaction could not be executed, because some + * unspecified protocol error was detected." */ + /* Check for null identifiers */ if (!conn_id) { LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (missing)\n", ENDPOINT_NUMBER(endp)); - return -1; + return 510; } /* Check for empty connection identifiers */ @@ -447,7 +450,7 @@ LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (empty)\n", ENDPOINT_NUMBER(endp)); - return -1; + return 510; } /* Check for over long connection identifiers */ @@ -455,7 +458,7 @@ LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n", ENDPOINT_NUMBER(endp), conn_id); - return -1; + return 510; } /* Check if connection exists */ @@ -466,7 +469,9 @@ "endpoint:0x%x no connection found under ConnectionIdentifier 0x%s\n", ENDPOINT_NUMBER(endp), conn_id); - return -1; + /* When the conn_id was not found, return error code 515 "The transaction refers to an incorrect + * connection-id (may have been already deleted)." */ + return 515; } /*! Extract individual lines from MCGP message. diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 7f4a7b8..bc191b5 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -999,10 +999,8 @@ break; case 'I': conn_id = (const char *)line + 3; - if (mgcp_verify_ci(endp, conn_id) != 0) { - error_code = 515; + if ((error_code = mgcp_verify_ci(endp, conn_id))) goto error3; - } break; case 'L': local_options = (const char *)line + 3; @@ -1185,10 +1183,8 @@ break; case 'I': conn_id = (const char *)line + 3; - if (mgcp_verify_ci(endp, conn_id) != 0) { - error_code = 515; + if ((error_code = mgcp_verify_ci(endp, conn_id))) goto error3; - } break; case 'Z': silent = strcmp("noanswer", line + 3) == 0; -- To view, visit https://gerrit.osmocom.org/10753 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: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6 Gerrit-Change-Number: 10753 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:46 +0000 Subject: Change in osmo-mgw[master]: fix mgcp_verify_ci(): off-by-one in max len check Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10754 Change subject: fix mgcp_verify_ci(): off-by-one in max len check ...................................................................... fix mgcp_verify_ci(): off-by-one in max len check MGCP_CONN_ID_MAXLEN actually includes a terminating nul, so we need to compare strlen() against MGCP_CONN_ID_MAXLEN-1. Log the length if it is too long. Add MDCX_TOO_LONG_CI test to mgcp_test.c, testing a conn id of 33 characters. Before this patch, the test returns error code 515 meaning "not found", while now it returns 510 meaning "invalid", showing the off-by-one. Same is illustrated by the error log ("not found" before, "too long" now), but the error log is not verified by mgcp_test.c. Change-Id: I8d6cc96be252bb486e94f343a8c7cae641ff9429 --- M src/libosmo-mgcp/mgcp_msg.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/54/10754/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index f732158..648d86b 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -454,10 +454,10 @@ } /* Check for over long connection identifiers */ - if (strlen(conn_id) > MGCP_CONN_ID_MAXLEN) { + if (strlen(conn_id) > (MGCP_CONN_ID_MAXLEN-1)) { LOGP(DLMGCP, LOGL_ERROR, - "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n", - ENDPOINT_NUMBER(endp), conn_id); + "endpoint:0x%x invalid ConnectionIdentifier (too long: %zu > %d) 0x%s\n", + ENDPOINT_NUMBER(endp), strlen(conn_id), MGCP_CONN_ID_MAXLEN-1, conn_id); return 510; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2f3a8a7..c40eabc 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -230,6 +230,12 @@ "I: %s\r\n" \ "L: p:20, a:AMR, nt:IN\r\n" +#define MDCX_TOO_LONG_CI \ + "MDCX 18983222 1 at mgw MGCP 1.0\r\n" \ + "I: 123456789012345678901234567890123\n" + +#define MDCX_TOO_LONG_CI_RET "510 18983222 FAIL\r\n" + #define SHORT2 "CRCX 1" #define SHORT2_RET "510 000000 FAIL\r\n" #define SHORT3 "CRCX 1 1 at mgw" @@ -510,6 +516,7 @@ {"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}, + {"MDCX_TOO_LONG_CI", MDCX_TOO_LONG_CI, MDCX_TOO_LONG_CI_RET}, }; static const struct mgcp_test retransmit[] = { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 915d45e..ddda751 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -443,6 +443,19 @@ Dummy packets: 2 ================================================ +Testing MDCX_TOO_LONG_CI +creating message from statically defined input: +---------8<--------- +MDCX 18983222 1 at mgw MGCP 1.0 +I: 123456789012345678901234567890123 + +---------8<--------- +checking response: +using message as statically defined for comparison +Response matches our expectations. +(response does not contain a connection id) + +================================================ Testing CRCX creating message from statically defined input: ---------8<--------- -- To view, visit https://gerrit.osmocom.org/10754 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: I8d6cc96be252bb486e94f343a8c7cae641ff9429 Gerrit-Change-Number: 10754 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 3 21:13:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:13:57 +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 ...................................................................... Set Ready For Review -- 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: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Sep 2018 21:13: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 Sep 3 21:15:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Sep 2018 21:15:24 +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 3: The previous patch indeed affected the maximum length that even libosmo-mgcp-client was able to handle. Instead, I have revisited the conn id code and put various unit tests in place (and fixed a few bugs). Now this patch clearly changes only the generated id. -- 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: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Sep 2018 21:15:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 08:23:49 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 4 Sep 2018 08:23:49 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings 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/10733 to look at the new patch set (#3). Change subject: Log using GSM48 Cause Value strings ...................................................................... Log using GSM48 Cause Value strings Use gsm48_cc_cause_name() in logging messages. Depends-On: I296f208581ce2550805f9d96e20f7319e1199023 Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 --- M src/mncc.c M src/sip.c 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/33/10733/3 -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte 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 Sep 4 08:31:05 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 4 Sep 2018 08:31:05 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10728 ) Change subject: Implement Cause Mapping ...................................................................... Patch Set 3: > Have a look at https://gerrit.osmocom.org/#/c/osmo-sip-connector/+/10734, Thanks Pau! -- 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: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Sep 2018 08:31:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 09:50:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 09:50:56 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log unsupported codec name used Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10755 Change subject: codec_pref: Log unsupported codec name used ...................................................................... codec_pref: Log unsupported codec name used Change-Id: If3ed8ba3bad7c927ed0efc908c005cd308e304e6 --- M src/osmo-bsc/codec_pref.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/10755/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 5f55312..212c2a6 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -43,7 +44,9 @@ return GSM48_CMODE_SPEECH_AMR; break; default: - LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech selected, assuming AMR as channel mode...\n"); + LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech %s selected, " + "assuming AMR as channel mode...\n", + gsm0808_permitted_speech_name(speech)); return GSM48_CMODE_SPEECH_AMR; } } -- To view, visit https://gerrit.osmocom.org/10755 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: If3ed8ba3bad7c927ed0efc908c005cd308e304e6 Gerrit-Change-Number: 10755 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 Sep 4 09:50:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 09:50:56 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log HR2 specifically as never specified Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10756 Change subject: codec_pref: Log HR2 specifically as never specified ...................................................................... codec_pref: Log HR2 specifically as never specified Change-Id: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e --- M src/osmo-bsc/codec_pref.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/10756/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 212c2a6..cbe8ef4 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -35,7 +35,6 @@ case GSM0808_PERM_FR1: return GSM48_CMODE_SPEECH_V1; break; - case GSM0808_PERM_HR2: case GSM0808_PERM_FR2: return GSM48_CMODE_SPEECH_EFR; break; @@ -43,6 +42,8 @@ case GSM0808_PERM_FR3: return GSM48_CMODE_SPEECH_AMR; break; + case GSM0808_PERM_HR2: + LOGP(DMSC, LOGL_FATAL, "Speech HR2 was never specified!\n"); default: LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech %s selected, " "assuming AMR as channel mode...\n", -- To view, visit https://gerrit.osmocom.org/10756 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: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e Gerrit-Change-Number: 10756 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 Sep 4 09:52:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Sep 2018 09:52:44 +0000 Subject: Change in libosmo-abis[master]: Properly deal with sockaddr_un socket path length limitations. 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/10647 to look at the new patch set (#2). 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/2 -- 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: newpatchset Gerrit-Change-Id: I36344805a825f5d0e0c9d218d438d8fd985ed9ca Gerrit-Change-Number: 10647 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling 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 Tue Sep 4 09:53:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Sep 2018 09:53:36 +0000 Subject: Change in libosmo-abis[master]: Properly deal with sockaddr_un socket path length limitations. In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10647 ) Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Patch Set 2: (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: const char *sock_path; > I think this one can actually be const char*, since osmo_sock_unix_init is already const char*. Yes, fixed in next patch set. -- 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: 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, 04 Sep 2018 09:53: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 Sep 4 09:55:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 09:55:16 +0000 Subject: Change in osmo-gsm-tester[master]: Remove tests for unspecified speech HR2 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10757 Change subject: Remove tests for unspecified speech HR2 ...................................................................... Remove tests for unspecified speech HR2 HR2 was never specified, so there's no sense in attempting to test it. Change-Id: Ifd7cab43bae0729106a9402e3e610eeecde645e4 --- M example/default-suites.conf D example/scenarios/cfg-codec-hr2.conf 2 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/10757/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 258d187..6b6e1d0 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -6,7 +6,6 @@ - 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 @@ -21,7 +20,6 @@ - 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 @@ -36,7 +34,6 @@ - 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 @@ -51,7 +48,6 @@ - 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 @@ -63,7 +59,6 @@ - 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 diff --git a/example/scenarios/cfg-codec-hr2.conf b/example/scenarios/cfg-codec-hr2.conf deleted file mode 100644 index e2cc9d2..0000000 --- a/example/scenarios/cfg-codec-hr2.conf +++ /dev/null @@ -1,5 +0,0 @@ -config: - bsc: - net: - codec_list: - - hr2 -- To view, visit https://gerrit.osmocom.org/10757 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: Ifd7cab43bae0729106a9402e3e610eeecde645e4 Gerrit-Change-Number: 10757 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 Sep 4 10:02:46 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 4 Sep 2018 10:02:46 +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 (#5). 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/5 -- 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: 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 Sep 4 10:02:46 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 4 Sep 2018 10:02:46 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings 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/10733 to look at the new patch set (#4). Change subject: Log using GSM48 Cause Value strings ...................................................................... Log using GSM48 Cause Value strings Use gsm48_cc_cause_name() in logging messages Depends-On: I296f208581ce2550805f9d96e20f7319e1199023 Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 --- M src/mncc.c M src/sip.c 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/33/10733/4 -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte 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 Sep 4 10:04:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 10:04:02 +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: > what? :) > > Ok, to put it differently, if you see code like this: > > x.foo = {}; > x.bar = 1; > x.baz = 5; > memset(&x.foo, 0, sizeof(x.foo)); > > and you remove the final memset because x.foo was already cleared > before, that for me constitutes a cosmetic code change. We can > agree at least that there is absolutely no functional difference!? The result may be the same, but the steps to do so change, like instructions executed, time spent. Would you consider changing a bubble sort with a quicksort a cosmetic change too? The patch is fine, I just get annoyed over time with the high amount of patches we mark as cosmetic that are actually changing how programs are executed, so I wanted to share my concerns. -- 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: Tue, 04 Sep 2018 10:04:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 10:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Sep 2018 10:06:02 +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 3: (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: > Should we merge this patch now? Does it reliably reproduce the above? Yes, I think we should merge it. The first test keeps passing, the second test keeps failing. So this change doesn't make things worse. It is unclear when the second test will start passing. I have not been able to make it pass on my hardware setup so far (for unrelated reasons). A pass on jenkins will require DTX support in trxcon. -- 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: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Sep 2018 10:06:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 10:08:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 10:08:45 +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 2: Code-Review+2 -- 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: 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, 04 Sep 2018 10:08: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 Sep 4 11:41:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:41:23 +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 submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved 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..00e1f9b 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 */ + const 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: merged Gerrit-Change-Id: I36344805a825f5d0e0c9d218d438d8fd985ed9ca Gerrit-Change-Number: 10647 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 Tue Sep 4 11:41:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:41:43 +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 3: Code-Review+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: comment Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Sep 2018 11:41:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 11:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:41:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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, 47 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fd2e50f..67f302f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3836,10 +3836,16 @@ 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; + 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 */ /* 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 }; + const integer frame_dtx_tchf_mod := 104; + /* Frame numbers (mod 104) for which a fill frame is expected at the L1SAP level, + * which operates in terms of blocks rather than frames. */ + var Integers required_tdma_blocks_dtx_tchf := { 52, 56 }; + const integer block_dtx_tchf_mod := 26; timer T := 5.0; f_l1_tune(L1CTL); @@ -3876,32 +3882,51 @@ 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 + frame_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. + * Furthermore, the L1SAP layer gives us frame numbers for the start of a block so + * we should only see the subset of frames numbers which correspond to a block boundary. + * TCH/F blocks are defined to start at 0,4,8,13,17,21 (modulo 26) */ + for (var integer i := 0; i < lengthof(required_tdma_blocks_dtx_tchf); i := i + 1) { + if (fn mod frame_dtx_tchf_mod == required_tdma_blocks_dtx_tchf[i]) { + nfill_frames_nonsacch := nfill_frames_nonsacch + 1; + repeat; + } + } + log("Received DTX TCH fill frame with bad frame number: ", fn, + " (mod ", frame_dtx_tchf_mod, ": ", fn mod frame_dtx_tchf_mod, ")", + " (mod ", block_dtx_tchf_mod, ": ", fn mod block_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 + frame_dtx_tchf_mod) { T.stop; if (f_g_chan_is_tchf()) { /* Without DTX we can expect 25 fill frames for every 104 frames. @@ -3921,9 +3946,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: merged Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 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 Tue Sep 4 11:41:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:41:54 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10733 ) Change subject: Log using GSM48 Cause Value strings ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 11:41: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 Sep 4 11:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:42:16 +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 5: Code-Review+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: comment Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Tue, 04 Sep 2018 11:42:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 11:42:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:42:24 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index ae60321..4cdc0b3 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); @@ -508,6 +508,8 @@ 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; start_cmd_timer(leg, MNCC_REL_CNF); @@ -529,6 +531,8 @@ 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 { @@ -587,7 +591,7 @@ 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: merged Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 5 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 Tue Sep 4 11:42:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:42:24 +0000 Subject: Change in osmo-sip-connector[master]: Cosmetic: correct spelling error in logging In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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: merged Gerrit-Change-Id: I1f323a738f2c8ff21984b574a0ff47fe175e9161 Gerrit-Change-Number: 10730 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte 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 Sep 4 11:42:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 11:42:24 +0000 Subject: Change in osmo-sip-connector[master]: Log using GSM48 Cause Value strings In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10733 ) Change subject: Log using GSM48 Cause Value strings ...................................................................... Log using GSM48 Cause Value strings Use gsm48_cc_cause_name() in logging messages Depends-On: I296f208581ce2550805f9d96e20f7319e1199023 Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 --- M src/mncc.c M src/sip.c 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index 4cdc0b3..1b44e05 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) cause(%d)\n", leg->callref, leg->base.cause); + "Releasing call in non-initial leg(%u) cause(%s)\n", leg->callref, gsm48_cc_cause_name(leg->base.cause)); leg->base.in_release = true; start_cmd_timer(leg, MNCC_REL_IND); mncc_send(leg->conn, MNCC_DISC_REQ, leg->callref); @@ -508,7 +508,7 @@ return; LOGP(DMNCC, - LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %d\n", data->cause.value); + LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %s\n", gsm48_cc_cause_name(data->cause.value)); LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was disconnected. Releasing\n", data->callref); leg->base.in_release = true; @@ -531,7 +531,7 @@ if (!leg) return; - LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %d\n", data->cause.value); + LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %s\n", gsm48_cc_cause_name(data->cause.value)); if (leg->base.in_release) stop_cmd_timer(leg, MNCC_REL_IND); @@ -591,7 +591,7 @@ other_leg->cause = data->cause.value; other_leg->release_call(other_leg); } - LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected with cause(%d).\n", data->callref, leg->cause); + LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected with cause(%s).\n", data->callref, gsm48_cc_cause_name(leg->cause)); mncc_leg_release(leg); } diff --git a/src/sip.c b/src/sip.c index cf457ad..adf20d8 100644 --- a/src/sip.c +++ b/src/sip.c @@ -298,12 +298,12 @@ *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); + LOGP(DSIP, LOGL_DEBUG, "%s(): Mapping cause(%s) to status(%d)\n", + __func__, gsm48_cc_cause_name(cause), *sip_status); return; } } - LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%d) not found in map.\n", __func__, cause); + LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%s) not found in map.\n", __func__, gsm48_cc_cause_name(cause)); *sip_status = cause_map[i].sip_status; *sip_phrase = cause_map[i].sip_phrase; *reason_text = cause_map[i].q850_reason; @@ -327,7 +327,7 @@ * to help us here. */ - LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%d)\n", __func__, _leg->cause); + LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause)); cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text); snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); -- To view, visit https://gerrit.osmocom.org/10733 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: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 Gerrit-Change-Number: 10733 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Sep 4 11:47:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Sep 2018 11:47:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo,s?= =?UTF-8?Q?uperfemto=5Fv5.1,default,osmocom-master-debian9_#1114?= Message-ID: <1140377302.130.1536061641958.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 35.73 KB...] 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.41-b99e > .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/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.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 crc32gen.c GEN crc16gen.c GEN crc8gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer_gettimeofday.lo CC timer.lo CC select.lo CC timer_clockgettime.lo CC bits.lo CC msgb.lo CC bitvec.lo CC signal.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 vector.lo CC utils.lo CC telnet_interface.lo CC logging_vty.lo CC stats_vty.lo /bin/bash: line 2: 16082 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 vty.lo -MD -MP -MF $depbase.Tpo -c -o vty.lo vty.c Makefile:476: recipe for target 'vty.lo' failed make[2]: *** [vty.lo] Error 139 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 Tue Sep 4 11:50:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Sep 2018 11:50:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmo-sccp_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1427?= Message-ID: <1305187857.131.1536061808614.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 61.40 KB...] 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 comp128.lo CC tlv_parser.lo CC comp128v23.lo CC rsl.lo CC gsm_utils.lo CC gsm48.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ CC gsm48_ie.lo 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 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_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.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.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC common_vty.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_if.lo CC control_cmd.lo CC control_vty.lo CC fsm_ctrl_commands.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 class_tables.lo CC reader.lo CC reader_pcsc.lo CC card_fs_usim.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_uicc.lo /bin/bash: line 2: 9221 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 /bin/bash: line 2: 9214 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 class_tables.lo -MD -MP -MF $depbase.Tpo -c -o class_tables.lo class_tables.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.... Makefile:490: recipe for target 'class_tables.lo' failed make[2]: *** [class_tables.lo] Error 132 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 Tue Sep 4 12:24:02 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 12:24: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 (#13). 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, 489 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/13 -- 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: 13 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 Sep 4 13:04:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Sep 2018 13:04:48 +0000 Subject: Change in docker-playground[master]: sctp-test: fix build and pin to specific commits Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/10758 Change subject: sctp-test: fix build and pin to specific commits ...................................................................... sctp-test: fix build and pin to specific commits Changes: * install ca-certificates, so "git clone" doesn't fail * checkout specific commits (the most recent ones right now), so we will get the same code every time we build the container and the patches won't fail to apply in the future * rebase patch "disable the use of scheduler priorities and mlockall" on top of master (I couldn't find the commit it was supposed to be based on) * delete obsolete patch that fixed compilation Change-Id: I7cd647684b983384f419b5cfbea0f8dfc7fee70e --- D sctp-test/0001-Fix-compilation-on-Linux.patch M sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch M sctp-test/Dockerfile 3 files changed, 23 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/58/10758/1 diff --git a/sctp-test/0001-Fix-compilation-on-Linux.patch b/sctp-test/0001-Fix-compilation-on-Linux.patch deleted file mode 100644 index 7ccf3e0..0000000 --- a/sctp-test/0001-Fix-compilation-on-Linux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3ed7dcf137c7ec53077faf31aae40b3c04cbedad Mon Sep 17 00:00:00 2001 -From: Harald Welte -Date: Wed, 3 May 2017 22:13:54 +0200 -Subject: [PATCH] Fix compilation on Linux - -DEBUG_LOGGING is a #define, we have to use the preprocessor to check for -it. ---- - gtests/net/packetdrill/packet_socket_linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gtests/net/packetdrill/packet_socket_linux.c b/gtests/net/packetdrill/packet_socket_linux.c -index 8abf106..572b5b8 100644 ---- a/gtests/net/packetdrill/packet_socket_linux.c -+++ b/gtests/net/packetdrill/packet_socket_linux.c -@@ -175,12 +175,12 @@ void packet_socket_set_filter(struct packet_socket *psock, - bpfcode.filter[3].k = ((client_ether[0] << 8) | - (client_ether[1])); - -- if (DEBUG_LOGGING) { -+#ifdef DEBUG_LOGGING - int i; - DEBUGP("filter constants:\n"); - for (i = 0; i < bpfcode.len; ++i) - DEBUGP("0x%x\n", bpfcode.filter[i].k); -- } -+#endif - - /* Attach the filter. */ - if (setsockopt(psock->packet_fd, SOL_SOCKET, SO_ATTACH_FILTER, --- -2.11.0 - diff --git a/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch b/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch index 9a12116..b337c6d 100644 --- a/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch +++ b/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch @@ -1,37 +1,38 @@ -From f3635ca581643f489836f6c603c9888ab7595c36 Mon Sep 17 00:00:00 2001 -From: Harald Welte -Date: Wed, 3 May 2017 22:31:53 +0200 +From 9f4fc59acf3df854da790da3824c1a3af497c40b Mon Sep 17 00:00:00 2001 +From: Oliver Smith +Date: Tue, 4 Sep 2018 14:24:52 +0200 Subject: [PATCH] disable the use of scheduler priorities and mlockall This doesn't work inside of docker, so let's disable it + +(This is the same patch as the one by laforge, just re-applied to +current master) --- - gtests/net/packetdrill/run.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + gtests/net/packetdrill/run.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtests/net/packetdrill/run.c b/gtests/net/packetdrill/run.c -index 54f4ebb..66a4c07 100644 +index 8467bb7..9268b50 100644 --- a/gtests/net/packetdrill/run.c +++ b/gtests/net/packetdrill/run.c -@@ -439,7 +439,7 @@ void set_scheduling_priority(void) +@@ -454,7 +454,7 @@ void set_scheduling_priority(void) if (num_cpus <= 1) return; --#if !defined(__OpenBSD__) +-#if !defined(__OpenBSD__) && !defined(__APPLE__) +#if 0 /* Chose a real-time policy, but use SCHED_RR instead of * SCHED_FIFO, so that we round-robin among real-time threads * of the same priority. In practice this shouldn't matter, -@@ -466,8 +466,10 @@ void set_scheduling_priority(void) +@@ -481,7 +481,7 @@ void set_scheduling_priority(void) */ void lock_memory(void) { +-#if !defined(__APPLE__) +#if 0 if (mlockall(MCL_CURRENT | MCL_FUTURE)) - die_perror("lockall(MCL_CURRENT | MCL_FUTURE)"); -+#endif - } - - /* Wait for and return the wall time at which we should start the + die_perror("mlockall(MCL_CURRENT | MCL_FUTURE)"); + #endif -- -2.11.0 +2.17.1 diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index 9719953..b39a459 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -4,6 +4,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ bison \ flex && \ apt-get clean @@ -15,15 +16,20 @@ WORKDIR /tmp +# Commit from 2018-08-28 RUN git clone https://github.com/nplab/packetdrill && \ cd packetdrill && \ + git checkout 89bb4f35393187d0d34a84170de529d688421be7 && \ git am /tmp/*.patch && \ cd gtests/net/packetdrill && \ ./configure && \ make && \ cp packetdrill /usr/bin/ -RUN git clone https://github.com/nplab/ETSI-SCTP-Conformance-Testsuite.git +# Commit from 2018-06-03 +RUN git clone https://github.com/nplab/ETSI-SCTP-Conformance-Testsuite.git && \ + cd "ETSI-SCTP-Conformance-Testsuite" && \ + git checkout 24768461f9b9be36a2a5e4b767c7afb749e3243f COPY run /tmp/run -- To view, visit https://gerrit.osmocom.org/10758 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: I7cd647684b983384f419b5cfbea0f8dfc7fee70e Gerrit-Change-Number: 10758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:05:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:05:08 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again In-Reply-To: References: Message-ID: Harald Welte 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: Code-Review+2 -- 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: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Sep 2018 13: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 Tue Sep 4 13:05:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:05:46 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again In-Reply-To: References: Message-ID: Harald Welte 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: I agree with pau, but I think the message was reeived and we can merge this now to avoid further spending time on debating how it shall be labelled. In the uture we should make less inflationary use of the word "cosmetic" -- 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: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Sep 2018 13:05:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:05:49 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) 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 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: merged Gerrit-Change-Id: I8b38f222f1c8c822e8e5e776850dbc60e30e8b8d Gerrit-Change-Number: 10699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:05:49 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: drop todo comments In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) 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 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: merged 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 -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:05:50 +0000 Subject: Change in osmo-bsc[master]: lchan: pick proper power and ta values In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) 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 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: merged Gerrit-Change-Id: I360b003398487fa6f934296ff03643c33ec61a35 Gerrit-Change-Number: 10701 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 Tue Sep 4 13:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:06:02 +0000 Subject: Change in osmo-gsm-tester[master]: Remove tests for unspecified speech HR2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10757 ) Change subject: Remove tests for unspecified speech HR2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10757 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: Ifd7cab43bae0729106a9402e3e610eeecde645e4 Gerrit-Change-Number: 10757 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 13: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 Tue Sep 4 13:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:06:03 +0000 Subject: Change in osmo-gsm-tester[master]: Remove tests for unspecified speech HR2 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10757 ) Change subject: Remove tests for unspecified speech HR2 ...................................................................... Remove tests for unspecified speech HR2 HR2 was never specified, so there's no sense in attempting to test it. Change-Id: Ifd7cab43bae0729106a9402e3e610eeecde645e4 --- M example/default-suites.conf D example/scenarios/cfg-codec-hr2.conf 2 files changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index 258d187..6b6e1d0 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -6,7 +6,6 @@ - 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 @@ -21,7 +20,6 @@ - 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 @@ -36,7 +34,6 @@ - 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 @@ -51,7 +48,6 @@ - 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 @@ -63,7 +59,6 @@ - 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 diff --git a/example/scenarios/cfg-codec-hr2.conf b/example/scenarios/cfg-codec-hr2.conf deleted file mode 100644 index e2cc9d2..0000000 --- a/example/scenarios/cfg-codec-hr2.conf +++ /dev/null @@ -1,5 +0,0 @@ -config: - bsc: - net: - codec_list: - - hr2 -- To view, visit https://gerrit.osmocom.org/10757 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: Ifd7cab43bae0729106a9402e3e610eeecde645e4 Gerrit-Change-Number: 10757 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 Tue Sep 4 13:07:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:07:02 +0000 Subject: Change in docker-playground[master]: sctp-test: fix build and pin to specific commits In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10758 ) Change subject: sctp-test: fix build and pin to specific commits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10758 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: I7cd647684b983384f419b5cfbea0f8dfc7fee70e Gerrit-Change-Number: 10758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 04 Sep 2018 13:07: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 Sep 4 13:07:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:07:06 +0000 Subject: Change in docker-playground[master]: sctp-test: fix build and pin to specific commits In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10758 ) Change subject: sctp-test: fix build and pin to specific commits ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10758 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: I7cd647684b983384f419b5cfbea0f8dfc7fee70e Gerrit-Change-Number: 10758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 04 Sep 2018 13:07:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:07:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:07:07 +0000 Subject: Change in docker-playground[master]: sctp-test: fix build and pin to specific commits In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10758 ) Change subject: sctp-test: fix build and pin to specific commits ...................................................................... sctp-test: fix build and pin to specific commits Changes: * install ca-certificates, so "git clone" doesn't fail * checkout specific commits (the most recent ones right now), so we will get the same code every time we build the container and the patches won't fail to apply in the future * rebase patch "disable the use of scheduler priorities and mlockall" on top of master (I couldn't find the commit it was supposed to be based on) * delete obsolete patch that fixed compilation Change-Id: I7cd647684b983384f419b5cfbea0f8dfc7fee70e --- D sctp-test/0001-Fix-compilation-on-Linux.patch M sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch M sctp-test/Dockerfile 3 files changed, 23 insertions(+), 49 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/sctp-test/0001-Fix-compilation-on-Linux.patch b/sctp-test/0001-Fix-compilation-on-Linux.patch deleted file mode 100644 index 7ccf3e0..0000000 --- a/sctp-test/0001-Fix-compilation-on-Linux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3ed7dcf137c7ec53077faf31aae40b3c04cbedad Mon Sep 17 00:00:00 2001 -From: Harald Welte -Date: Wed, 3 May 2017 22:13:54 +0200 -Subject: [PATCH] Fix compilation on Linux - -DEBUG_LOGGING is a #define, we have to use the preprocessor to check for -it. ---- - gtests/net/packetdrill/packet_socket_linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gtests/net/packetdrill/packet_socket_linux.c b/gtests/net/packetdrill/packet_socket_linux.c -index 8abf106..572b5b8 100644 ---- a/gtests/net/packetdrill/packet_socket_linux.c -+++ b/gtests/net/packetdrill/packet_socket_linux.c -@@ -175,12 +175,12 @@ void packet_socket_set_filter(struct packet_socket *psock, - bpfcode.filter[3].k = ((client_ether[0] << 8) | - (client_ether[1])); - -- if (DEBUG_LOGGING) { -+#ifdef DEBUG_LOGGING - int i; - DEBUGP("filter constants:\n"); - for (i = 0; i < bpfcode.len; ++i) - DEBUGP("0x%x\n", bpfcode.filter[i].k); -- } -+#endif - - /* Attach the filter. */ - if (setsockopt(psock->packet_fd, SOL_SOCKET, SO_ATTACH_FILTER, --- -2.11.0 - diff --git a/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch b/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch index 9a12116..b337c6d 100644 --- a/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch +++ b/sctp-test/0001-disable-the-use-of-scheduler-priorities-and-mlockall.patch @@ -1,37 +1,38 @@ -From f3635ca581643f489836f6c603c9888ab7595c36 Mon Sep 17 00:00:00 2001 -From: Harald Welte -Date: Wed, 3 May 2017 22:31:53 +0200 +From 9f4fc59acf3df854da790da3824c1a3af497c40b Mon Sep 17 00:00:00 2001 +From: Oliver Smith +Date: Tue, 4 Sep 2018 14:24:52 +0200 Subject: [PATCH] disable the use of scheduler priorities and mlockall This doesn't work inside of docker, so let's disable it + +(This is the same patch as the one by laforge, just re-applied to +current master) --- - gtests/net/packetdrill/run.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + gtests/net/packetdrill/run.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtests/net/packetdrill/run.c b/gtests/net/packetdrill/run.c -index 54f4ebb..66a4c07 100644 +index 8467bb7..9268b50 100644 --- a/gtests/net/packetdrill/run.c +++ b/gtests/net/packetdrill/run.c -@@ -439,7 +439,7 @@ void set_scheduling_priority(void) +@@ -454,7 +454,7 @@ void set_scheduling_priority(void) if (num_cpus <= 1) return; --#if !defined(__OpenBSD__) +-#if !defined(__OpenBSD__) && !defined(__APPLE__) +#if 0 /* Chose a real-time policy, but use SCHED_RR instead of * SCHED_FIFO, so that we round-robin among real-time threads * of the same priority. In practice this shouldn't matter, -@@ -466,8 +466,10 @@ void set_scheduling_priority(void) +@@ -481,7 +481,7 @@ void set_scheduling_priority(void) */ void lock_memory(void) { +-#if !defined(__APPLE__) +#if 0 if (mlockall(MCL_CURRENT | MCL_FUTURE)) - die_perror("lockall(MCL_CURRENT | MCL_FUTURE)"); -+#endif - } - - /* Wait for and return the wall time at which we should start the + die_perror("mlockall(MCL_CURRENT | MCL_FUTURE)"); + #endif -- -2.11.0 +2.17.1 diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index 9719953..b39a459 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -4,6 +4,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ bison \ flex && \ apt-get clean @@ -15,15 +16,20 @@ WORKDIR /tmp +# Commit from 2018-08-28 RUN git clone https://github.com/nplab/packetdrill && \ cd packetdrill && \ + git checkout 89bb4f35393187d0d34a84170de529d688421be7 && \ git am /tmp/*.patch && \ cd gtests/net/packetdrill && \ ./configure && \ make && \ cp packetdrill /usr/bin/ -RUN git clone https://github.com/nplab/ETSI-SCTP-Conformance-Testsuite.git +# Commit from 2018-06-03 +RUN git clone https://github.com/nplab/ETSI-SCTP-Conformance-Testsuite.git && \ + cd "ETSI-SCTP-Conformance-Testsuite" && \ + git checkout 24768461f9b9be36a2a5e4b767c7afb749e3243f COPY run /tmp/run -- To view, visit https://gerrit.osmocom.org/10758 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: I7cd647684b983384f419b5cfbea0f8dfc7fee70e Gerrit-Change-Number: 10758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:07:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:07:33 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log unsupported codec name used In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10755 ) Change subject: codec_pref: Log unsupported codec name used ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10755 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: If3ed8ba3bad7c927ed0efc908c005cd308e304e6 Gerrit-Change-Number: 10755 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 13:07: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 Sep 4 13:08:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:08:00 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log HR2 specifically as never specified In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10756 ) Change subject: codec_pref: Log HR2 specifically as never specified ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10756/1/src/osmo-bsc/codec_pref.c File src/osmo-bsc/codec_pref.c: https://gerrit.osmocom.org/#/c/10756/1/src/osmo-bsc/codec_pref.c at 46 PS1, Line 46: LOGP is the fall-through intentional? -- To view, visit https://gerrit.osmocom.org/10756 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: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e Gerrit-Change-Number: 10756 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 04 Sep 2018 13:08:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:08:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:08:03 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log unsupported codec name used In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10755 ) Change subject: codec_pref: Log unsupported codec name used ...................................................................... codec_pref: Log unsupported codec name used Change-Id: If3ed8ba3bad7c927ed0efc908c005cd308e304e6 --- M src/osmo-bsc/codec_pref.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 5f55312..212c2a6 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -43,7 +44,9 @@ return GSM48_CMODE_SPEECH_AMR; break; default: - LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech selected, assuming AMR as channel mode...\n"); + LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech %s selected, " + "assuming AMR as channel mode...\n", + gsm0808_permitted_speech_name(speech)); return GSM48_CMODE_SPEECH_AMR; } } -- To view, visit https://gerrit.osmocom.org/10755 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: If3ed8ba3bad7c927ed0efc908c005cd308e304e6 Gerrit-Change-Number: 10755 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 Tue Sep 4 13:42:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:42:41 +0000 Subject: Change in osmo-trx[master]: update git-version-gen to generate proper version numbers Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10759 Change subject: update git-version-gen to generate proper version numbers ...................................................................... update git-version-gen to generate proper version numbers We don't want the version of the last tagged version, but the version number uniquely representing the current HEAD. Use the script from libosmocore. I suspect that this somehow got broken in commit 00d5114717040fedd443e3f723385ede434c8b39 Change-Id: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b --- M git-version-gen 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/59/10759/1 diff --git a/git-version-gen b/git-version-gen index 51d4bf7..42cf3d2 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,7 +93,8 @@ then : # use $v elif - v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \ + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; -- To view, visit https://gerrit.osmocom.org/10759 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: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b Gerrit-Change-Number: 10759 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:43:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 13:43:44 +0000 Subject: Change in osmo-trx[master]: update git-version-gen to generate proper version numbers In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10759 ) Change subject: update git-version-gen to generate proper version numbers ...................................................................... update git-version-gen to generate proper version numbers We don't want the version of the last tagged version, but the version number uniquely representing the current HEAD. Use the script from libosmocore. I suspect that this somehow got broken in commit 00d5114717040fedd443e3f723385ede434c8b39 Related: OS#3517 Change-Id: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b --- M git-version-gen 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/59/10759/2 -- To view, visit https://gerrit.osmocom.org/10759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b Gerrit-Change-Number: 10759 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:44:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 4 Sep 2018 13:44:50 +0000 Subject: Change in osmo-bts[master]: measurement: fix SACCH interval remapping in test_is_meas_overdue() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10760 Change subject: measurement: fix SACCH interval remapping in test_is_meas_overdue() ...................................................................... measurement: fix SACCH interval remapping in test_is_meas_overdue() The function test_is_meas_overdue() checks if a SACCH block was lost in order to be able to conclude the measurement interval even when the SAACH block gets lost. Unfortunately, the measurements for the SACCH do not arrive in order with the normal voice measurements. The measurement for the SACCH is shifted by -26 frames but arrives with the correct frame number. The detection logic that checks for dropped out SACCH frames does not take this correctly into account. It calculates the frame number shift, but it still expects the measurements to arrive in order. This needs to be fixed. - Add logic to work around the frame number shift - Adapt unit tests Change-Id: Idf6db73f67b7273c3d5965616c9e78f66b74a406 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, 246 insertions(+), 184 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/10760/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index b4fc35b..a071fdb 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -8,7 +8,7 @@ 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); +int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); void lchan_meas_reset(struct gsm_lchan *lchan); diff --git a/src/common/measurement.c b/src/common/measurement.c index 59f5d83..bfba11f 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -240,32 +240,6 @@ 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 * (this function is only used internally, it is public to call it from * unit-tests) */ @@ -322,6 +296,41 @@ return rc; } +/* The measurement indications of voice blocks are not received in order with + * the measurement indications of the SACCH blocks. In relation to the normal + * voice blocks the The SACCH block that concludes the measurement interval is + * received 26 frames earlier than its frame number would indicate. In order + * to simplify the computation that detects if a SACCH frame was missed or not + * we subtract 26 from all SACCH frame numbers. This function MUST only be used + * with TCH/H and TCH/F channels. */ +static uint32_t fn_demangle(uint32_t fn) +{ + uint8_t rc; + + /* Since a similar problem exists in is_meas_complete(), we can borrow + * from there. translate_tch_meas_rep_fn104() returns 0 if the frame + * number does not belong to a SACCH frame */ + rc = translate_tch_meas_rep_fn104(fn % 104); + + if (rc > 0 && fn >= 26) + return fn - 26; + else if (rc > 0) + return GSM_MAX_FN - (26 - fn); + + return fn; +} + +/* Inverse function of fn_demangle to convert the resulting fn back, this + * function must only be used with frame numbers that fall onto a SACCH + * interval end. It also must be a frame number from a TCH/H or a TCH/F. */ +static uint32_t fn_mangle(uint32_t fn) +{ + if (fn <= GSM_MAX_FN - 26) + return fn + 26; + else + return fn - (GSM_MAX_FN - 26); +} + /* 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 @@ -332,6 +341,7 @@ { uint32_t fn_mod; uint32_t last_fn_mod; + uint32_t last_fn; uint32_t fn_rounded; uint8_t interval_end; uint8_t modulus; @@ -349,7 +359,8 @@ case GSM_PCHAN_TCH_F: modulus = 104; interval_end = tchf_meas_rep_fn104_by_ts[lchan->ts->nr]; - interval_end = translate_tch_meas_rep_fn104_inv(interval_end); + fn = fn_demangle(fn); + last_fn = fn_demangle(lchan->meas.last_fn); break; case GSM_PCHAN_TCH_H: modulus = 104; @@ -358,17 +369,20 @@ else tbl = tchh1_meas_rep_fn104_by_ts; interval_end = tbl[lchan->ts->nr]; - interval_end = translate_tch_meas_rep_fn104_inv(interval_end); + fn = fn_demangle(fn); + last_fn = fn_demangle(lchan->meas.last_fn); break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; interval_end = sdcch8_meas_rep_fn102_by_ss[lchan->nr]; + last_fn = lchan->meas.last_fn; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; interval_end = sdcch4_meas_rep_fn102_by_ss[lchan->nr]; + last_fn = lchan->meas.last_fn; break; default: return false; @@ -376,7 +390,7 @@ } fn_mod = fn % modulus; - last_fn_mod = lchan->meas.last_fn % modulus; + last_fn_mod = last_fn % modulus; fn_rounded = fn - fn_mod; if (fn_mod > last_fn_mod) { @@ -386,6 +400,8 @@ * position on which the interval should have ended. */ if (interval_end > last_fn_mod && interval_end < fn_mod) { *fn_missed_end = interval_end + fn_rounded; + if(modulus == 104) + *fn_missed_end = fn_mangle(*fn_missed_end); return true; } } else { @@ -395,19 +411,23 @@ * 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) + if (fn < last_fn) *fn_missed_end = interval_end + GSM_MAX_FN - modulus; else *fn_missed_end = interval_end + fn_rounded - modulus; + if(modulus == 104) + *fn_missed_end = fn_mangle(*fn_missed_end); 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) + if (fn < last_fn) *fn_missed_end = interval_end; else *fn_missed_end = interval_end + fn_rounded; + if(modulus == 104) + *fn_missed_end = fn_mangle(*fn_missed_end); return true; } } @@ -800,10 +820,11 @@ * 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) +int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { uint32_t fn_missed_end; bool missed_end; + int rc; /* The measurement processing detects the end of a measurement period * by checking if the received measurement sample is from a SACCH @@ -821,12 +842,22 @@ * of a new interval */ lchan_meas_check_compute(lchan, fn_missed_end); lchan_new_ul_meas(lchan, ulm, fn); + + /* Report to the caller that we missed an inverval end + * (unit-test) */ + rc = 1; } 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); + + /* Report to the caller that the measurement was processed + * normally (unit-test) */ + rc = 0; } + + return rc; } /* Reset all measurement related struct members to their initial values. This diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index a33a808..ca08ba8 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -68,8 +68,8 @@ static void reset_lchan_meas(struct gsm_lchan *lchan) { + lchan_meas_reset(lchan); lchan->state = LCHAN_S_ACTIVE; - memset(&lchan->meas, 0, sizeof(lchan->meas)); } static void test_meas_compute(const struct meas_testcase *mtc) @@ -136,236 +136,236 @@ printf("===========================================================\n"); printf("Testing is_meas_overdue()\n"); - /* Missing period-end-trigger at fn=12, TCH/F, TS0 */ + /* Missing period-end-trigger at fn=12(90), 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); + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 12 + 104); - /* Missing period-end-trigger at fn=12, TCH/H, TS0 */ + /* Missing period-end-trigger at fn=12(90), TCH/H, TS0.0 */ 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); + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 12 + 104); - /* Missing period-end-trigger at fn=12, TCH/H, TS1 */ + /* Missing period-end-trigger at fn=12(90), TCH/H, TS1.0 */ 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); + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 12 + 104); - /* Missing period-end-trigger at fn=25, TCH/F, TS1 */ + /* Missing period-end-trigger at fn=25(103), 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); + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); - OSMO_ASSERT(fn_missed_end == 25); + OSMO_ASSERT(fn_missed_end == 25 + 104); - /* Missing period-end-trigger at fn=25, TCH/H, TS0 */ + /* Missing period-end-trigger at fn=25(103), TCH/H, TS0.1 */ 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); + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); - OSMO_ASSERT(fn_missed_end == 25); + OSMO_ASSERT(fn_missed_end == 25 + 104); - /* Missing period-end-trigger at fn=25, TCH/H, TS1 */ + /* Missing period-end-trigger at fn=25(103), TCH/H, TS1.1 */ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[1].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 == 25 + 104); + + /* Missing period-end-trigger at fn=38(12), 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 = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38 + 104); + + /* Missing period-end-trigger at fn=38(12), TCH/H, TS2.0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].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 == 38 + 104); + + /* Missing period-end-trigger at fn=38(12), TCH/H, TS3.0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[3].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 == 38 + 104); + + /* Missing period-end-trigger at fn=51(25), 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 = 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 */ + /* Missing period-end-trigger at fn=51(25), 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); + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 51); - /* Missing period-end-trigger at fn=51, TCH/H, TS3 */ + /* Missing period-end-trigger at fn=51(25), TCH/H, TS3.1 */ 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); + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 51); - /* Missing period-end-trigger at fn=64, TCH/F, TS4 */ + /* Missing period-end-trigger at fn=64(38), 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); + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 64); - /* Missing period-end-trigger at fn=64, TCH/H, TS4 */ + /* Missing period-end-trigger at fn=64(38)38, TCH/H, TS4.0 */ 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); + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 64); - /* Missing period-end-trigger at fn=64, TCH/H, TS4 */ + /* Missing period-end-trigger at fn=64(38)38, TCH/H, TS5.0 */ 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); + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 64); - /* Missing period-end-trigger at fn=77, TCH/F, TS5 */ + /* Missing period-end-trigger at fn=77(51), 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); + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 77); - /* Missing period-end-trigger at fn=77, TCH/H, TS4 */ + /* Missing period-end-trigger at fn=77(51), TCH/H, TS5.1 */ 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); + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 77); - /* Missing period-end-trigger at fn=77, TCH/H, TS5 */ + /* Missing period-end-trigger at fn=77(51), TCH/H, TS6.1 */ 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); + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 77); - /* Missing period-end-trigger at fn=90, TCH/F, TS6 */ + /* Missing period-end-trigger at fn=90(64), 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); + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 90); - /* Missing period-end-trigger at fn=90, TCH/H, TS6 */ + /* Missing period-end-trigger at fn=90(64), TCH/H, TS6.0 */ 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); + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 90); - /* Missing period-end-trigger at fn=90, TCH/H, TS7 */ + /* Missing period-end-trigger at fn=90(64), TCH/H, TS7.0 */ 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); + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 90); - /* Missing period-end-trigger at fn=103, TCH/F, TS7 */ + /* Missing period-end-trigger at fn=103(77), 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); + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); - /* Missing period-end-trigger at fn=103, TCH/H, TS6 */ + /* Missing period-end-trigger at fn=103(77), TCH/H, TS6.1 */ 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); + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); - /* Missing period-end-trigger at fn=103, TCH/H, TS7 */ + /* Missing period-end-trigger at fn=103(77), TCH/H, TS7.1 */ 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); + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); 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 = &trx->ts[0].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 */ + /* No dropout, but right after period-end-trigger (64=>38) */ fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[2].lchan[0]; + lchan = &trx->ts[4].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_H; - lchan->meas.last_fn = 38; + lchan->meas.last_fn = 64; rc = is_meas_overdue(lchan, &fn_missed_end, 39); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); @@ -373,92 +373,92 @@ /* 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 = &trx->ts[0].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) */ + /* No dropout, Two neigbouring frames (period end, right side, 64=>38) */ fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[2].lchan[0]; + lchan = &trx->ts[4].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_H; - lchan->meas.last_fn = 38; + lchan->meas.last_fn = 64; 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) */ + * should not happen in the real world, 64=>38) */ fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[2].lchan[0]; + lchan = &trx->ts[4].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_H; lchan->meas.last_fn = 37; - rc = is_meas_overdue(lchan, &fn_missed_end, 38); + rc = is_meas_overdue(lchan, &fn_missed_end, 64); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); - /* No dropout, test directly on a the trigger frame */ + /* No dropout, test directly on a the trigger frame (64=>38) */ fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[2].lchan[0]; + lchan = &trx->ts[4].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_H; - lchan->meas.last_fn = 34; - rc = is_meas_overdue(lchan, &fn_missed_end, 38); + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 64); 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) */ + * (should not happen in the real world, 64=>38) */ fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[2].lchan[0]; + lchan = &trx->ts[4].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_H; - lchan->meas.last_fn = 38; - rc = is_meas_overdue(lchan, &fn_missed_end, 38); + lchan->meas.last_fn = 64; + rc = is_meas_overdue(lchan, &fn_missed_end, 39); 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. */ + * see the modulus is correct. (64=>38) */ for (i = 0; i < 100; i++) { fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[2].lchan[0]; + lchan = &trx->ts[4].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); + OSMO_ASSERT(fn_missed_end == 64 + 104 * 1); } /* See whats happening if we miss a period-end-triggerend at the - * hyperframe beginning. */ + * hyperframe beginning (12=>38). */ fn_missed_end = LCHAN_FN_DUMMY; - lchan = &trx->ts[0].lchan[0]; + lchan = &trx->ts[2].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); + OSMO_ASSERT(fn_missed_end == 38); /* 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 = &trx->ts[0].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); + OSMO_ASSERT(fn_missed_end == 12); /* 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 = &trx->ts[1].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); + OSMO_ASSERT(fn_missed_end == 25); /* Test a wrap around at the hyperframe ending, while no measurements * are lost */ @@ -897,6 +897,7 @@ unsigned int fn = 0; unsigned int fn104; struct bts_ul_meas ulm; + int rc = 0; printf("\n\n"); printf("===========================================================\n"); @@ -928,12 +929,18 @@ 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); + printf + ("(now adding SUB measurement sample %u)\n", + fn); + rc += 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); + 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) { @@ -942,13 +949,33 @@ } else k++; - if (fn % 104 == 39 && no_sacch == false) { - printf("(now adding SUB measurement sample for SACCH block at frame number %u)\n", fn); + /* Note: The SACCH frame that concludes the measurement interval is + * expected to be received at pos 13 with the frame number 38. This + * is exactly one 26 multiframe later. */ + if (fn % 104 == 13 && no_sacch == false) { + printf + ("(now adding SUB measurement sample for SACCH block at frame number %u)\n", + fn - 1 + 26); ulm.is_sub = 1; - lchan_meas_process_measurement(lchan, &ulm, fn - 1); - } else if (fn % 104 == 39 && no_sacch == true) - printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn); + rc += + lchan_meas_process_measurement(lchan, &ulm, + fn - 1 + 26); + } else if (fn % 104 == 13 && no_sacch == true) + printf + ("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", + fn - 1 + 26); } + + if (no_sacch == false && rc > 0) { + printf + ("lchan_meas_process_measurement() is falsely indicating missed interval ends!\n"); + OSMO_ASSERT(false); + } else if (no_sacch == true && rc == 0) { + printf + ("lchan_meas_process_measurement() is falsely does not detect missed interval ends!\n"); + OSMO_ASSERT(false); + } + } static bool test_ts45008_83_is_sub_is_sacch(uint32_t fn) diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 3d4f430..d7f85e9 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -723,73 +723,76 @@ =========================================================== Testing lchan_meas_process_measurement() -(now adding SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample for SACCH block at frame number 38) (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 for SACCH block at frame number 142) (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 for SACCH block at frame number 246) (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 for SACCH block at frame number 350) (now adding SUB measurement sample 364) (now adding SUB measurement sample 368) +(now adding SUB measurement sample for SACCH block at frame number 454) =========================================================== Testing lchan_meas_process_measurement() * SACCH blocks not generated. -(leaving out SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for SACCH block at frame number 38) (now adding SUB measurement sample 52) (now adding SUB measurement sample 56) -(leaving out SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for SACCH block at frame number 142) (now adding SUB measurement sample 156) (now adding SUB measurement sample 160) -(leaving out SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for SACCH block at frame number 246) (now adding SUB measurement sample 260) (now adding SUB measurement sample 264) -(leaving out SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for SACCH block at frame number 350) (now adding SUB measurement sample 364) (now adding SUB measurement sample 368) +(leaving out SUB measurement sample for SACCH block at frame number 454) =========================================================== Testing lchan_meas_process_measurement() * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) +(now adding SUB measurement sample for SACCH block at frame number 38) (leaving out measurement sample for frame number 17) (leaving out measurement sample for frame number 34) -(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 frame number 86) (leaving out measurement sample for frame number 104) +(now adding SUB measurement sample for SACCH block at frame number 142) (leaving out measurement sample for frame number 121) (leaving out measurement sample for frame number 138) -(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 frame number 190) (leaving out measurement sample for frame number 208) +(now adding SUB measurement sample for SACCH block at frame number 246) (leaving out measurement sample for frame number 225) (leaving out measurement sample for frame number 242) -(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 frame number 294) (leaving out measurement sample for frame number 312) +(now adding SUB measurement sample for SACCH block at frame number 350) (leaving out measurement sample for frame number 329) (leaving out measurement sample for frame number 346) -(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 frame number 398) (leaving out measurement sample for frame number 416) +(now adding SUB measurement sample for SACCH block at frame number 454) =========================================================== @@ -797,38 +800,39 @@ * SACCH blocks not generated. * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) +(leaving out SUB measurement sample for SACCH block at frame number 38) (leaving out measurement sample for frame number 17) (leaving out measurement sample for frame number 34) -(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 frame number 86) (leaving out measurement sample for frame number 104) +(leaving out SUB measurement sample for SACCH block at frame number 142) (leaving out measurement sample for frame number 121) (leaving out measurement sample for frame number 138) -(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 frame number 190) (leaving out measurement sample for frame number 208) +(leaving out SUB measurement sample for SACCH block at frame number 246) (leaving out measurement sample for frame number 225) (leaving out measurement sample for frame number 242) -(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 frame number 294) (leaving out measurement sample for frame number 312) +(leaving out SUB measurement sample for SACCH block at frame number 350) (leaving out measurement sample for frame number 329) (leaving out measurement sample for frame number 346) -(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 frame number 398) (leaving out measurement sample for frame number 416) +(leaving out SUB measurement sample for SACCH block at frame number 454) =========================================================== -- To view, visit https://gerrit.osmocom.org/10760 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: Idf6db73f67b7273c3d5965616c9e78f66b74a406 Gerrit-Change-Number: 10760 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 4 Sep 2018 13:44:51 +0000 Subject: Change in osmo-bts[master]: measurement: send measurement reports for missed interval ends Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10761 Change subject: measurement: send measurement reports for missed interval ends ...................................................................... measurement: send measurement reports for missed interval ends When the end of the measurement interval can not be detected because the SACCH block got lost, then the logic runs the measurement computation, but there is no measurement report sent via RSL. This is due to the fact that those reports are triggered when a SACCH frame from the MS is received. The computed measurement result is then put into an RSL message together with the DTAP message from the MS. However, it is legal to leave the DTAP part out if it has not been received. Lets add a function to rsl.c that we can call from measurement.c in order to force an RSL measurement report when a missing interval end is detected. - Add new function rsl_push_meas_res() - Call rsl_push_meas_res() when an interval end has been missed. Change-Id: Ia6d20136832714e3d439ddf9abaea0f66898bb61 Related: OS#3502 --- M include/osmo-bts/rsl.h M src/common/measurement.c M src/common/rsl.c 3 files changed, 32 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/10761/1 diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 06d58a2..a7e2d58 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -42,6 +42,7 @@ void cb_ts_disconnected(struct gsm_bts_trx_ts *ts); void cb_ts_connected(struct gsm_bts_trx_ts *ts); void ipacc_dyn_pdch_complete(struct gsm_bts_trx_ts *ts, int rc); +void rsl_push_meas_res(struct gsm_lchan *lchan); #endif // _RSL_H */ diff --git a/src/common/measurement.c b/src/common/measurement.c index bfba11f..90af761 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -841,6 +841,7 @@ * and add the uplink measurement we got as the first sample * of a new interval */ lchan_meas_check_compute(lchan, fn_missed_end); + rsl_push_meas_res(lchan); lchan_new_ul_meas(lchan, ulm, fn); /* Report to the caller that we missed an inverval end diff --git a/src/common/rsl.c b/src/common/rsl.c index ff2d997..84106d8 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2590,6 +2590,7 @@ uint8_t chan_nr = gsm_lchan2chan_nr(lchan); int res_valid = lchan->meas.flags & LC_UL_M_F_RES_VALID; struct gsm_bts *bts = lchan->ts->trx->bts; + int timing_offset = -1; LOGP(DRSL, LOGL_DEBUG, "%s chan_num:%u Tx MEAS RES valid(%d), flags(%02x)\n", @@ -2602,8 +2603,10 @@ if (!msg) return -ENOMEM; + if (le) + timing_offset = ms_to2rsl(lchan, le) - MEAS_MAX_TIMING_ADVANCE; LOGP(DRSL, LOGL_DEBUG, - "%s Send Meas RES: NUM:%u, RXLEV_FULL:%u, RXLEV_SUB:%u, RXQUAL_FULL:%u, RXQUAL_SUB:%u, MS_PWR:%u, UL_TA:%u, L3_LEN:%d, TimingOff:%u\n", + "%s Send Meas RES: NUM:%u, RXLEV_FULL:%u, RXLEV_SUB:%u, RXQUAL_FULL:%u, RXQUAL_SUB:%u, MS_PWR:%u, UL_TA:%u, L3_LEN:%d, TimingOff:%i\n", gsm_lchan_name(lchan), lchan->meas.res_nr, lchan->meas.ul_res.full.rx_lev, @@ -2611,7 +2614,7 @@ lchan->meas.ul_res.full.rx_qual, lchan->meas.ul_res.sub.rx_qual, lchan->meas.l1_info[0], - lchan->meas.l1_info[1], l3_len, ms_to2rsl(lchan, le) - MEAS_MAX_TIMING_ADVANCE); + lchan->meas.l1_info[1], l3_len, timing_offset); msgb_tv_put(msg, RSL_IE_MEAS_RES_NR, lchan->meas.res_nr++); size_t ie_len = gsm0858_rsl_ul_meas_enc(&lchan->meas.ul_res, @@ -2641,13 +2644,26 @@ lchan->meas.flags &= ~LC_UL_M_F_RES_VALID; } msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->meas.bts_tx_pwr); + + /* NOTE: In the following we will add measurement results that depend + * on valid L1 and L3 messages from the MS. If we lost the last SACCH + * block we do not have this info. For those cases we will leave out + * L1 info, L3 info and MS timing offset but we will still reset the + * related flags just to be sure. See also: 3GPP TS 08.58, + * chapter 8.4.8 MEASUREMENT RESULT */ if (lchan->meas.flags & LC_UL_M_F_L1_VALID) { - msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, lchan->meas.l1_info); + if (l3 && l3_len > 0) + msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, + lchan->meas.l1_info); lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; } - msgb_tl16v_put(msg, RSL_IE_L3_INFO, l3_len, l3); + + if (l3 && l3_len > 0) + msgb_tl16v_put(msg, RSL_IE_L3_INFO, l3_len, l3); if (ms_to_valid(lchan)) { - msgb_tv_put(msg, RSL_IE_MS_TIMING_OFFSET, ms_to2rsl(lchan, le)); + if (l3 && l3_len > 0 && le) + msgb_tv_put(msg, RSL_IE_MS_TIMING_OFFSET, + ms_to2rsl(lchan, le)); lchan->ms_t_offs = -1; lchan->p_offs = -1; } @@ -2658,6 +2674,15 @@ return abis_bts_rsl_sendmsg(msg); } +/* forcefully push a measurement report to RSL. This is called by measurement.c, + * when it detects that a SACCH block was lost. The report will then only + * contain the measurement data from the BTS since the measurement data from + * the MS is lost in those cases */ +void rsl_push_meas_res(struct gsm_lchan *lchan) +{ + rsl_tx_meas_res(lchan, NULL, 0, NULL); +} + /* call-back for LAPDm code, called when it wants to send msgs UP */ int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx) { -- To view, visit https://gerrit.osmocom.org/10761 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: Ia6d20136832714e3d439ddf9abaea0f66898bb61 Gerrit-Change-Number: 10761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 4 Sep 2018 13:44:51 +0000 Subject: Change in osmo-bts[master]: measurement: display fn_mod when measuremnet is added Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10762 Change subject: measurement: display fn_mod when measuremnet is added ...................................................................... measurement: display fn_mod when measuremnet is added When adding a new measurement also log the frame number by the modulus of the measurement interval to simplify debuggung Change-Id: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a --- M src/common/measurement.c 1 file changed, 32 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/10762/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 90af761..ab76097 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -435,21 +435,46 @@ return false; } +/* determine the measurement interval modulus by a given lchan */ +static uint8_t modulus_by_lchan(struct gsm_lchan *lchan) +{ + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + return 104; + break; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + return 102; + break; + default: + /* Invalid */ + return 1; + break; + } +} + /* 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) { + uint32_t fn_mod = fn % modulus_by_lchan(lchan); + if (lchan->state != LCHAN_S_ACTIVE) { LOGPFN(DMEAS, LOGL_NOTICE, fn, - "%s measurement during state: %s, num_ul_meas=%d\n", - gsm_lchan_name(lchan), gsm_lchans_name(lchan->state), - lchan->meas.num_ul_meas); + "%s measurement during state: %s, num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), gsm_lchans_name(lchan->state), + lchan->meas.num_ul_meas, fn_mod); } if (lchan->meas.num_ul_meas >= ARRAY_SIZE(lchan->meas.uplink)) { LOGPFN(DMEAS, LOGL_NOTICE, fn, - "%s no space for uplink measurement, num_ul_meas=%d\n", - gsm_lchan_name(lchan), lchan->meas.num_ul_meas); + "%s no space for uplink measurement, num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), lchan->meas.num_ul_meas, fn_mod); return -ENOSPC; } @@ -458,8 +483,8 @@ if (!ulm->is_sub) ulm->is_sub = ts45008_83_is_sub(lchan, fn, false); - DEBUGPFN(DMEAS, fn, "%s adding measurement (is_sub=%u), num_ul_meas=%d\n", - gsm_lchan_name(lchan), ulm->is_sub, lchan->meas.num_ul_meas); + DEBUGPFN(DMEAS, fn, "%s adding measurement (is_sub=%u), num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), ulm->is_sub, lchan->meas.num_ul_meas, fn_mod); memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm, sizeof(*ulm)); -- To view, visit https://gerrit.osmocom.org/10762 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: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a Gerrit-Change-Number: 10762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 13:51:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 13:51:11 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log HR2 specifically as never specified In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10756 ) Change subject: codec_pref: Log HR2 specifically as never specified ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10756/1/src/osmo-bsc/codec_pref.c File src/osmo-bsc/codec_pref.c: https://gerrit.osmocom.org/#/c/10756/1/src/osmo-bsc/codec_pref.c at 46 PS1, Line 46: LOGP > is the fall-through intentional? Yes, it has been moved here just to provide extra information on why the speech is unsupported. I could add a /* fall-through */ comment in there if required. -- To view, visit https://gerrit.osmocom.org/10756 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: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e Gerrit-Change-Number: 10756 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 04 Sep 2018 13: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 Tue Sep 4 13:53:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 13:53:17 +0000 Subject: Change in osmo-trx[master]: update git-version-gen to generate proper version numbers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10759 ) Change subject: update git-version-gen to generate proper version numbers ...................................................................... Patch Set 2: Code-Review+1 I cannot +2 here, so +1 :-) -- To view, visit https://gerrit.osmocom.org/10759 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: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b Gerrit-Change-Number: 10759 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Sep 2018 13:53:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 14:15:54 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 4 Sep 2018 14:15:54 +0000 Subject: Change in simtrace2[master]: EEPROM: fix Wformat compile warning Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10763 Change subject: EEPROM: fix Wformat compile warning ...................................................................... EEPROM: fix Wformat compile warning Change-Id: I86434a46a75f2acc30e20c33edab6dd3f87e052b --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/63/10763/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 55efb54..dcfe17f 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -165,13 +165,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); -- To view, visit https://gerrit.osmocom.org/10763 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: I86434a46a75f2acc30e20c33edab6dd3f87e052b Gerrit-Change-Number: 10763 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 Sep 4 14:15:54 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 4 Sep 2018 14:15:54 +0000 Subject: Change in simtrace2[master]: qmod: add LED user control Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10764 Change subject: qmod: add LED user control ...................................................................... qmod: add LED user control this is used during board testing Change-Id: I4ccd787f6e307f523821725de158e3c6f1508ee2 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/64/10764/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index dcfe17f..9073489 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -19,6 +19,7 @@ #include "board.h" #include "simtrace.h" #include "utils.h" +#include "led.h" #include "wwan_led.h" #include "wwan_perst.h" #include "sim_switch.h" @@ -186,6 +187,10 @@ case '?': printf("\t?\thelp\n\r"); printf("\tR\treset SAM3\n\r"); + printf("\tl\tswitch off LED 1\n\r"); + printf("\tL\tswitch off LED 1\n\r"); + printf("\tg\tswitch off LED 2\n\r"); + printf("\tG\tswitch off LED 2\n\r"); if (qmod_sam3_is_12()) { printf("\tE\tprogram EEPROM\n\r"); printf("\te\tErase EEPROM\n\r"); @@ -209,6 +214,22 @@ USBD_Disconnect(); NVIC_SystemReset(); break; + case 'l': + led_blink(LED_GREEN, BLINK_ALWAYS_OFF); + printf("LED 1 switched off\n\r"); + break; + case 'L': + led_blink(LED_GREEN, BLINK_ALWAYS_ON); + printf("LED 1 switched on\n\r"); + break; + case 'g': + led_blink(LED_RED, BLINK_ALWAYS_OFF); + printf("LED 2 switched off\n\r"); + break; + case 'G': + led_blink(LED_RED, BLINK_ALWAYS_ON); + printf("LED 2 switched on\n\r"); + break; case 'X': printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r"); PIO_Clear(&pin_peer_rst); -- To view, visit https://gerrit.osmocom.org/10764 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: I4ccd787f6e307f523821725de158e3c6f1508ee2 Gerrit-Change-Number: 10764 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 Sep 4 14:24:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:21 +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 2: Code-Review+2 -- 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: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Sep 2018 14:24: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 Sep 4 14:24:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:39 +0000 Subject: Change in simtrace2[master]: EEPROM: fix Wformat compile warning In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10763 ) Change subject: EEPROM: fix Wformat compile warning ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10763 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: I86434a46a75f2acc30e20c33edab6dd3f87e052b Gerrit-Change-Number: 10763 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 14:24: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 Sep 4 14:24:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:56 +0000 Subject: Change in simtrace2[master]: qmod: add LED user control In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10764 ) Change subject: qmod: add LED user control ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10764 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: I4ccd787f6e307f523821725de158e3c6f1508ee2 Gerrit-Change-Number: 10764 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 14:24: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 Sep 4 14:24:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:57 +0000 Subject: Change in simtrace2[master]: stdio: fix detection of malformated format strings In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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, 18 insertions(+), 8 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 2bfaed7..a8612d1 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -429,12 +429,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 +459,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: merged Gerrit-Change-Id: I8506b05d56da55d1357a1234917adf341b46e1db Gerrit-Change-Number: 10671 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 14:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:58 +0000 Subject: Change in simtrace2[master]: DFU: fix Wformat compile warning In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) 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 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: merged Gerrit-Change-Id: I8c422d8a709f8311c40d37e1f1f01dcd3a199b6f Gerrit-Change-Number: 10672 Gerrit-PatchSet: 2 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 Tue Sep 4 14:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:58 +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 submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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: merged Gerrit-Change-Id: Ib8d3cbd01d0e34432d424355f4fafb24bc5273a1 Gerrit-Change-Number: 10673 Gerrit-PatchSet: 2 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 Tue Sep 4 14:24:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:59 +0000 Subject: Change in simtrace2[master]: EEPROM: fix Wformat compile warning In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10763 ) Change subject: EEPROM: fix Wformat compile warning ...................................................................... EEPROM: fix Wformat compile warning Change-Id: I86434a46a75f2acc30e20c33edab6dd3f87e052b --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 55efb54..dcfe17f 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -165,13 +165,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); -- To view, visit https://gerrit.osmocom.org/10763 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: I86434a46a75f2acc30e20c33edab6dd3f87e052b Gerrit-Change-Number: 10763 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 Tue Sep 4 14:24:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:24:59 +0000 Subject: Change in simtrace2[master]: qmod: add LED user control In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10764 ) Change subject: qmod: add LED user control ...................................................................... qmod: add LED user control this is used during board testing Change-Id: I4ccd787f6e307f523821725de158e3c6f1508ee2 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index dcfe17f..9073489 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -19,6 +19,7 @@ #include "board.h" #include "simtrace.h" #include "utils.h" +#include "led.h" #include "wwan_led.h" #include "wwan_perst.h" #include "sim_switch.h" @@ -186,6 +187,10 @@ case '?': printf("\t?\thelp\n\r"); printf("\tR\treset SAM3\n\r"); + printf("\tl\tswitch off LED 1\n\r"); + printf("\tL\tswitch off LED 1\n\r"); + printf("\tg\tswitch off LED 2\n\r"); + printf("\tG\tswitch off LED 2\n\r"); if (qmod_sam3_is_12()) { printf("\tE\tprogram EEPROM\n\r"); printf("\te\tErase EEPROM\n\r"); @@ -209,6 +214,22 @@ USBD_Disconnect(); NVIC_SystemReset(); break; + case 'l': + led_blink(LED_GREEN, BLINK_ALWAYS_OFF); + printf("LED 1 switched off\n\r"); + break; + case 'L': + led_blink(LED_GREEN, BLINK_ALWAYS_ON); + printf("LED 1 switched on\n\r"); + break; + case 'g': + led_blink(LED_RED, BLINK_ALWAYS_OFF); + printf("LED 2 switched off\n\r"); + break; + case 'G': + led_blink(LED_RED, BLINK_ALWAYS_ON); + printf("LED 2 switched on\n\r"); + break; case 'X': printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r"); PIO_Clear(&pin_peer_rst); -- To view, visit https://gerrit.osmocom.org/10764 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: I4ccd787f6e307f523821725de158e3c6f1508ee2 Gerrit-Change-Number: 10764 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 Tue Sep 4 14:25:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:25:16 +0000 Subject: Change in osmo-bts[master]: measurement: display fn_mod when measuremnet is added In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10762 ) Change subject: measurement: display fn_mod when measuremnet is added ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10762 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: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a Gerrit-Change-Number: 10762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 14:25:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 14:36:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 14:36:07 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... 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/10743 to look at the new patch set (#3). Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error Transceiver::stop() can only be called from either CTRL iface thread or from main thread (running osmocom loop). That's because stop attempts to cancel and then join all the other threads, which would then lock if attempting to stop from some of them. As a result, the best option is to indicate to the user of the transceiver option (osmo-trx.cpp) to stop it in a correct fashion by destroying the object from the main thread. Change-Id: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 --- M CommonLibs/Makefile.am A CommonLibs/osmo_signal.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 79 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/43/10743/3 -- To view, visit https://gerrit.osmocom.org/10743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 14:40:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 14:40:54 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log HR2 specifically as never specified In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10756 ) Change subject: codec_pref: Log HR2 specifically as never specified ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10756 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: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e Gerrit-Change-Number: 10756 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: Tue, 04 Sep 2018 14:40: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 Sep 4 14:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Sep 2018 14:45:47 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10677 ) Change subject: mgcp_conn_get(): compare conn Id ('I:') case insensitively ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10677/3/src/libosmo-mgcp/mgcp_conn.c File src/libosmo-mgcp/mgcp_conn.c: https://gerrit.osmocom.org/#/c/10677/3/src/libosmo-mgcp/mgcp_conn.c at 202 PS3, Line 202: rc = osmo_strlcpy(id_upper, id, sizeof(id_upper)); this should use osmo_str2upper(), or maybe a new osmo_str_to_upper() with a length check which I have in a libosmocore branch. -- 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: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Sep 2018 14:45:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 15:36:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 15:36:40 +0000 Subject: Change in libosmo-abis[master]: debian: Conflict libosmoabis6 with libosmoabis5 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10765 Change subject: debian: Conflict libosmoabis6 with libosmoabis5 ...................................................................... debian: Conflict libosmoabis6 with libosmoabis5 In previous commit 9540f59b1daeac36d71b20ac9cefe15019d6277c, libosmoabis packaging was fixed to match its contained major lib version. However, systems using nightly may run into issues when upgrading since now libosmoabis6 in repo tries to overwrite libosmoabis5 in their system and fails. By using Conflicts + Replaces it should do it now without erroring. Fixes: OS#3365 Change-Id: If98ae21670f13554da5aa46fe30741d56631fd8c --- M debian/control 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/65/10765/1 diff --git a/debian/control b/debian/control index 9a4b27d..e47fc22 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,10 @@ Section: libs Architecture: any Multi-Arch: same +# Due to previous release issues, libosmoabis5 actually installed same libosmoabis.so.6 file. +# Once major is increased to 7, following two lines below can be dropped: +Conflicts: libosmoabis5 +Replaces: libosmoabis5 Depends: ${shlibs:Depends}, ${misc:Depends} Description: GSM A-bis handling -- To view, visit https://gerrit.osmocom.org/10765 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: If98ae21670f13554da5aa46fe30741d56631fd8c Gerrit-Change-Number: 10765 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 Sep 4 16:04:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:04:52 +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 (#14). 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, 494 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/14 -- 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: 14 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 jenkins at lists.osmocom.org Tue Sep 4 16:07:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Sep 2018 16:07:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-libosmo-sccp_=C2=BB_a1?= =?UTF-8?Q?=3Ddefault,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1428?= In-Reply-To: <1305187857.131.1536061808614.JavaMail.jenkins@jenkins.osmocom.org> References: <1305187857.131.1536061808614.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1325421557.133.1536077258385.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:19:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 16:19:06 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10743 ) Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Sep 2018 16:19:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:19:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:19:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10766 Change subject: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ...................................................................... L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC send a Authentication & Ciphering failure to resync the USIM with the HLR. Change-Id: Ia58dc1483757887ca14cfae19e30f9c91fef5874 --- M library/L3_Templates.ttcn 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/10766/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 44d9e73..557b1b8 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2112,6 +2112,28 @@ } } +template PDU_L3_MS_SGSN ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(octetstring auts) := { + discriminator := '1000'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + authenticationAndCipheringFailure := { + messageType := '00011100'B, + gmmCause := { + causeValue := '15'O /* GMM_CAUSE_SYNC_FAIL 10.5.3.2.2 */ + }, + authenticationFailureParam := { + elementIdentifier := '30'O, + lengthIndicator := 14, + valueField := auts + } + } + } + } +} + const BIT3 c_GMM_DTT_MO_GPRS := '001'B; const BIT3 c_GMM_DTT_MO_IMSI := '010'B; -- To view, visit https://gerrit.osmocom.org/10766 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: Ia58dc1483757887ca14cfae19e30f9c91fef5874 Gerrit-Change-Number: 10766 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:19:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:19:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain ATUS Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10767 Change subject: L3_Common: extend the AuthVector to contain ATUS ...................................................................... L3_Common: extend the AuthVector to contain ATUS AUTS is used in the UMTS AKA resync procedure. Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb --- M library/L3_Common.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/10767/1 diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn index bf7818a..1513d9e 100644 --- a/library/L3_Common.ttcn +++ b/library/L3_Common.ttcn @@ -11,7 +11,8 @@ OCT16 ik, OCT16 ck, OCT16 autn, - OCT8 res + OCT8 res, + OCT14 auts } private function f_rnd_oct(integer len) return octetstring { @@ -37,6 +38,7 @@ vec.ck := f_rnd_oct(16); vec.autn := f_rnd_oct(16); vec.res := f_rnd_oct(8); + vec.auts := f_rnd_oct(14); return vec; } -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:19:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:19:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10768 Change subject: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC ...................................................................... GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC Match only on AKA RESYNC packages Change-Id: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 --- M library/GSUP_Types.ttcn 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/10768/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index ba8180f..0d21404 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -299,6 +299,17 @@ template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi); +template GSUP_PDU tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC( + template hexstring imsi, + template octetstring auts, + template octetstring rand) := + tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_AUTS(auts), + tr_GSUP_IE_RAND(rand), + * + }); + template (value) GSUP_PDU ts_GSUP_SAI_RES(hexstring imsi, GSUP_IE auth_tuple) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), auth_tuple }); @@ -464,6 +475,14 @@ } } +template GSUP_IE tr_GSUP_IE_AUTS(template octetstring auts) := { + tag := OSMO_GSUP_AUTS_IE, + len := ?, + val := { + auts := auts + } +} + template (value) GSUP_IE ts_GSUP_IE_RAND(octetstring rand) := { tag := OSMO_GSUP_RAND_IE, len := 0, /* overwritten */ @@ -472,6 +491,14 @@ } } +template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand) := { + tag := OSMO_GSUP_RAND_IE, + len := ?, + val := { + rand := rand + } +} + template (value) GSUP_IE ts_GSUP_IE_SRES(octetstring sres) := { tag := OSMO_GSUP_SRES_IE, len := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/10768 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: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 Gerrit-Change-Number: 10768 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:19:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:19:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10769 Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... sgsn: implement TC_attach_usim_resync Change-Id: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d --- M sgsn/SGSN_Tests.ttcn 1 file changed, 128 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/10769/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 82c37f2..517223c 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1899,6 +1899,133 @@ vc_conn.done; } +private function f_TC_attach_usim_resync(charstring id) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + var RoutingAreaIdentificationV old_ra := f_random_RAI(); + + var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); + + /* send Attach Request */ + /* indicate R99 capability of the MS to enable UMTS AKA in presence of + * 3G auth vectors */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.revisionLevelIndicatior := '1'B; + /* The thing is, if the solSACapability is 'omit', then the + * revisionLevelIndicatior is at the wrong place! */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; + f_send_l3_gmm_llc(attach_req); + + /* do the auth */ + var PDU_L3_MS_SGSN l3_mo; + var PDU_L3_SGSN_MS l3_mt; + var default di := activate(as_mm_identity()); + + var GSUP_IE auth_tuple; + var template AuthenticationParameterAUTNTLV autn; + + g_pars.vec := f_gen_auth_vec_3g(); + autn := { + elementIdentifier := '28'O, + lengthIndicator := lengthof(g_pars.vec.autn), + autnValue := g_pars.vec.autn + }; + + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + log("GSUP sends 2G and 3G auth tuples", auth_tuple); + GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + + var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); + auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; + BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + + /* send the gmm auth failure with resync IE */ + f_send_l3_gmm_llc(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts)); + + /* wait for the GSUP resync request */ + GSUP.receive(tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC( + g_pars.imsi, + g_pars.vec.auts, + g_pars.vec.rand)); + + /* regenerate the token */ + g_pars.vec := f_gen_auth_vec_3g(); + autn := { + elementIdentifier := '28'O, + lengthIndicator := lengthof(g_pars.vec.autn), + autnValue := g_pars.vec.autn + }; + + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + + auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); + auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; + BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + l3_mt := bd.l3_mt; + 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); + + + /* set UMTS response instead */ + auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationParResp := { + valueField := substr(g_pars.vec.res, 0, 4) + }; + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationRespParExt := { + elementIdentifier := '21'O, + lengthIndicator := lengthof(g_pars.vec.res) - 4, + valueField := substr(g_pars.vec.res, 4, lengthof(g_pars.vec.res) - 4) + }; + + l3_mo := valueof(auth_ciph_resp); + if (ispresent(l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest) and + l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest.valueField == '001'B) { + l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := + valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); + } + f_send_l3_gmm_llc(l3_mo); + deactivate(di); + + /* Expect SGSN to perform LU with HLR */ + f_gmm_gsup_lu_isd(); + + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + } + /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ + f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + setverdict(pass); +} + +testcase TC_attach_usim_resync() runs on test_CT { + /* MS -> SGSN: Attach Request + * MS <- SGSN: Identity Request IMSI + * MS -> SGSN: Identity Response IMSI + * MS <- SGSN: Identity Request IMEI + * MS -> SGSN: Identity Response IMEI + * MS <- SGSN: Auth Request + * MS -> SGSN: Auth Response + * MS <- SGSN: Attach Accept + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_usim_resync), testcasename(), g_gb, 38); + vc_conn.done; +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1940,6 +2067,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_usim_resync() ); } -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:19:46 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:19:46 +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 (#15). 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, 494 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/15 -- 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: 15 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 Sep 4 16:40:29 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:40:29 +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: lynxis lazus has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 82c37f2..497e45f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -461,12 +461,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 bssgp_index := 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[bssgp_index]); } function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { @@ -498,7 +498,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 bssgp_index := 0) runs on BSSGP_ConnHdlr { /* mandatory IE */ g_pars.ra := ra.routingAreaId; if (ispresent(ra.allocatedPTMSI)) { @@ -506,7 +506,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, bssgp_index); } if (ispresent(ra.msIdentity)) { setverdict(fail, "unexpected TMSI allocation in non-combined attach"); @@ -867,10 +867,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_index := 0) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; timer T := 5.0; - f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off)); + f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp_index); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -881,7 +881,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_index].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; @@ -890,12 +890,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_index].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_index].receive { repeat; } } } @@ -1857,7 +1857,7 @@ 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); + f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp); f_send_l3_gmm_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: merged Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 4 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 Sep 4 16:40:30 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:40:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce TC_attach_rau_a_b In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 497e45f..edc19bc 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1899,6 +1899,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() ); @@ -1925,6 +1958,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: merged Gerrit-Change-Id: Ie636778628c216e315bd6f5bc11e0e5bd9c218a5 Gerrit-Change-Number: 10387 Gerrit-PatchSet: 3 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 Sep 4 16:40:30 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:40:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: use vty cmd `reset sgsn state`. In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( 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. Depends on the SGSN commit I92096f3f6ea49e75676e30e9921d00210bac5382. Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index edc19bc..1453456 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -206,6 +206,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"); } @@ -263,12 +264,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-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(); 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: merged Gerrit-Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 Gerrit-Change-Number: 10388 Gerrit-PatchSet: 5 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 Sep 4 16:40:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:40:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: increase the timeout of some TC In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1453456..66319b5 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1948,14 +1948,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: merged Gerrit-Change-Id: I12baf4b2425d0d862755d03d16127b18968e28f2 Gerrit-Change-Number: 10389 Gerrit-PatchSet: 3 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 Sep 4 16:40:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:40:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix TC_attach_check_complete_resend In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 66319b5..8094866 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1821,13 +1821,16 @@ f_send_l3_gmm_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: merged Gerrit-Change-Id: I3fa5c100b8389e184acf1e71e2792e5474c22dec Gerrit-Change-Number: 10390 Gerrit-PatchSet: 3 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 Sep 4 16:40:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:40:32 +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: lynxis lazus has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 8094866..3f479da 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1766,7 +1766,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 */ @@ -1786,6 +1786,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 @@ -1805,12 +1814,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: merged Gerrit-Change-Id: I8e5ae832f3908a172b9beb6d936074b806e0c799 Gerrit-Change-Number: 10391 Gerrit-PatchSet: 3 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 Sep 4 16:42:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 16:42:20 +0000 Subject: Change in osmo-bts[master]: measurement: fix SACCH interval remapping in test_is_meas_overdue() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10760 ) Change subject: measurement: fix SACCH interval remapping in test_is_meas_overdue() ...................................................................... Patch Set 1: Code-Review-1 (12 comments) https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c at 304 PS1, Line 304: This function MUST only be used : * with TCH/H and TCH/F channels This way it makes sense to add '_tch' postfix to this symbol. https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c at 403 PS1, Line 403: if(modulus == 104) Coding style? https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c at 418 PS1, Line 418: if(modulus == 104) Same here. https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c at 429 PS1, Line 429: if(modulus == 104) and here... https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c at 860 PS1, Line 860: return rc; cosmetic: why not to return exactly from the condition branches? https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c File tests/meas/meas_test.c: https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 71 PS1, Line 71: lchan_meas_reset(lchan); Let's keep the original order of function calls. https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 932 PS1, Line 932: printf : ( Coding style? Why do we need to have this wrap? https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 937 PS1, Line 937: printf : ( same here https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 941 PS1, Line 941: printf : ( same here https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 956 PS1, Line 956: printf : ( same here https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 960 PS1, Line 960: rc += : and here too... https://gerrit.osmocom.org/#/c/10760/1/tests/meas/meas_test.c at 978 PS1, Line 978: ws -- To view, visit https://gerrit.osmocom.org/10760 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: Idf6db73f67b7273c3d5965616c9e78f66b74a406 Gerrit-Change-Number: 10760 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Sep 2018 16:42:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:53:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:53:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10766 to look at the new patch set (#3). Change subject: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ...................................................................... L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC send a Authentication & Ciphering failure to resync the USIM with the HLR. Change-Id: Ia58dc1483757887ca14cfae19e30f9c91fef5874 --- M library/L3_Templates.ttcn 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/10766/3 -- To view, visit https://gerrit.osmocom.org/10766 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: Ia58dc1483757887ca14cfae19e30f9c91fef5874 Gerrit-Change-Number: 10766 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:53:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:53:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain ATUS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10767 to look at the new patch set (#3). Change subject: L3_Common: extend the AuthVector to contain ATUS ...................................................................... L3_Common: extend the AuthVector to contain ATUS AUTS is used in the UMTS AKA resync procedure. Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb --- M library/L3_Common.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/10767/3 -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:53:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:53:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10768 to look at the new patch set (#3). Change subject: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC ...................................................................... GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC Match only on AKA RESYNC packages Change-Id: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 --- M library/GSUP_Types.ttcn 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/10768/3 -- To view, visit https://gerrit.osmocom.org/10768 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: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 Gerrit-Change-Number: 10768 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:55:02 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 4 Sep 2018 16:55:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10769 ) Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 16:55:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 16:57:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 16:57:30 +0000 Subject: Change in osmo-bts[master]: measurement: display fn_mod when measuremnet is added In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10762 ) Change subject: measurement: display fn_mod when measuremnet is added ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10762/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10762/1/src/common/measurement.c at 457 PS1, Line 457: break; cosmetic: no need to break as we return from here. https://gerrit.osmocom.org/#/c/10762/1/src/common/measurement.c at 470 PS1, Line 470: This cosmetic alignment is unrelated. -- To view, visit https://gerrit.osmocom.org/10762 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: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a Gerrit-Change-Number: 10762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Sep 2018 16:57: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 Sep 4 17:12:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:12:58 +0000 Subject: Change in osmo-bts[master]: measurement: display fn_mod when measuremnet is added In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10762 ) Change subject: measurement: display fn_mod when measuremnet is added ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10762/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10762/1//COMMIT_MSG at 7 PS1, Line 7: measuremnet spelling -- To view, visit https://gerrit.osmocom.org/10762 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: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a Gerrit-Change-Number: 10762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Sep 2018 17:12:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:13:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:13:26 +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 5: 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: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:13: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 Sep 4 17:13:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:13:27 +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 submitted this change and it was merged. ( 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 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3f479da..0112483 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1943,6 +1943,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_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); + + alt { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + 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_l3_gmm_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_l3_gmm_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_l3_gmm_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_l3_gmm_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_l3_gmm_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() ); @@ -1985,6 +2057,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: merged Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 5 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 Tue Sep 4 17:13:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:13:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10766 ) Change subject: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10766 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: Ia58dc1483757887ca14cfae19e30f9c91fef5874 Gerrit-Change-Number: 10766 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:13:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:15:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:15:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain ATUS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10767 ) Change subject: L3_Common: extend the AuthVector to contain ATUS ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10767/3/library/L3_Common.ttcn File library/L3_Common.ttcn: https://gerrit.osmocom.org/#/c/10767/3/library/L3_Common.ttcn at 15 PS3, Line 15: OCT14 auts does it really make sense to store the AUTS value as part of the vector? Isn't AUTS computed somehow? I don't think the SGSN or MSC/VLR store AUTS values... -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:15:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:15:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:15:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10766 ) Change subject: L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ...................................................................... L3_Template: add template ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC send a Authentication & Ciphering failure to resync the USIM with the HLR. Change-Id: Ia58dc1483757887ca14cfae19e30f9c91fef5874 --- M library/L3_Templates.ttcn 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 44d9e73..557b1b8 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2112,6 +2112,28 @@ } } +template PDU_L3_MS_SGSN ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(octetstring auts) := { + discriminator := '1000'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + authenticationAndCipheringFailure := { + messageType := '00011100'B, + gmmCause := { + causeValue := '15'O /* GMM_CAUSE_SYNC_FAIL 10.5.3.2.2 */ + }, + authenticationFailureParam := { + elementIdentifier := '30'O, + lengthIndicator := 14, + valueField := auts + } + } + } + } +} + const BIT3 c_GMM_DTT_MO_GPRS := '001'B; const BIT3 c_GMM_DTT_MO_IMSI := '010'B; -- To view, visit https://gerrit.osmocom.org/10766 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: Ia58dc1483757887ca14cfae19e30f9c91fef5874 Gerrit-Change-Number: 10766 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 Tue Sep 4 17:15:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:15:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10768 ) Change subject: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10768 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: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 Gerrit-Change-Number: 10768 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:15: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 Sep 4 17:16:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:16:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10769 ) Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:16:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:17:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:17:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain ATUS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10767 ) Change subject: L3_Common: extend the AuthVector to contain ATUS ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10767/3/library/L3_Common.ttcn File library/L3_Common.ttcn: https://gerrit.osmocom.org/#/c/10767/3/library/L3_Common.ttcn at 15 PS3, Line 15: OCT14 auts > does it really make sense to store the AUTS value as part of the vector? Isn't AUTS computed someho [?] Ok, after reading the test case I understand how it's used. However, it still feels odd. I suggest to put a comment here in the source stating that the AUTS value isn't strictly part of the tuple (as per 3GPP meaning of an authentication vector/quintuple) but that we nonetheless use this field here to make sure we use the same auts value both on the GSUP and on the L3 side. -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:17:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:17:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:17:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain ATUS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10767 ) Change subject: L3_Common: extend the AuthVector to contain ATUS ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17: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 Tue Sep 4 17:28:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:28:28 +0000 Subject: Change in osmo-bts[master]: measurement: fix SACCH interval remapping in test_is_meas_overdue() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10760 ) Change subject: measurement: fix SACCH interval remapping in test_is_meas_overdue() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10760/1/src/common/measurement.c at 316 PS1, Line 316: return fn - 26; as we discussed in person, it's actually rather 26*3 than 26. The result is simply the same in modulo arithmetic. Let's please add some related comments and re-write it with 26*3 as that's the difference between the first and the last SACCH burst in the 26-multiframe. -- To view, visit https://gerrit.osmocom.org/10760 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: Idf6db73f67b7273c3d5965616c9e78f66b74a406 Gerrit-Change-Number: 10760 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 04 Sep 2018 17:28:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:30:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:30:49 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9257 ) Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... Patch Set 15: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/9257/15/include/osmocom/sgsn/gprs_gmm_attach.h File include/osmocom/sgsn/gprs_gmm_attach.h: https://gerrit.osmocom.org/#/c/9257/15/include/osmocom/sgsn/gprs_gmm_attach.h at 8 PS15, Line 8: enum gmm_attach_req_fsm_states { if those states are modelled after any spec reference, it might be useful to document it here in a comment. https://gerrit.osmocom.org/#/c/9257/15/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/9257/15/src/gprs/gprs_gmm_attach.c at 2 PS15, Line 2: please put the usual license header on top o the file, simply copying it from a neighboring file https://gerrit.osmocom.org/#/c/9257/15/src/gprs/gprs_gmm_attach.c at 387 PS15, Line 387: static __attribute__((constructor)) void l2tp_fsm_init(void) l2tp ? -- 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: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 04 Sep 2018 17:30:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:31:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:31:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain ATUS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10767 ) Change subject: L3_Common: extend the AuthVector to contain ATUS ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10767/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10767/3//COMMIT_MSG at 7 PS3, Line 7: ATUS AUTS -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:31:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:31:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:31:33 +0000 Subject: Change in libosmo-abis[master]: debian: Conflict libosmoabis6 with libosmoabis5 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10765 ) Change subject: debian: Conflict libosmoabis6 with libosmoabis5 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10765 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: If98ae21670f13554da5aa46fe30741d56631fd8c Gerrit-Change-Number: 10765 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:31: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 Sep 4 17:31:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:31:34 +0000 Subject: Change in libosmo-abis[master]: debian: Conflict libosmoabis6 with libosmoabis5 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10765 ) Change subject: debian: Conflict libosmoabis6 with libosmoabis5 ...................................................................... debian: Conflict libosmoabis6 with libosmoabis5 In previous commit 9540f59b1daeac36d71b20ac9cefe15019d6277c, libosmoabis packaging was fixed to match its contained major lib version. However, systems using nightly may run into issues when upgrading since now libosmoabis6 in repo tries to overwrite libosmoabis5 in their system and fails. By using Conflicts + Replaces it should do it now without erroring. Fixes: OS#3365 Change-Id: If98ae21670f13554da5aa46fe30741d56631fd8c --- M debian/control 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 9a4b27d..e47fc22 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,10 @@ Section: libs Architecture: any Multi-Arch: same +# Due to previous release issues, libosmoabis5 actually installed same libosmoabis.so.6 file. +# Once major is increased to 7, following two lines below can be dropped: +Conflicts: libosmoabis5 +Replaces: libosmoabis5 Depends: ${shlibs:Depends}, ${misc:Depends} Description: GSM A-bis handling -- To view, visit https://gerrit.osmocom.org/10765 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: If98ae21670f13554da5aa46fe30741d56631fd8c Gerrit-Change-Number: 10765 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 Tue Sep 4 17:35:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:16 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10743 ) Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Sep 2018 17:35:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:35:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:25 +0000 Subject: Change in osmo-trx[master]: Logger: Disable pthread cancel point inside Logger destructor In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10739 ) Change subject: Logger: Disable pthread cancel point inside Logger destructor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10739 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: I71ca90f3fbc73df58b878a03361f7b7831d838b4 Gerrit-Change-Number: 10739 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:35:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:35:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:45 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10740 ) Change subject: cosmetic: Fix trailing whitespace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10740 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: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 Gerrit-Change-Number: 10740 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: Tue, 04 Sep 2018 17:35: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 Sep 4 17:35:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:48 +0000 Subject: Change in osmo-trx[master]: Logger: Disable pthread cancel point inside Logger destructor In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10739 ) Change subject: Logger: Disable pthread cancel point inside Logger destructor ...................................................................... Logger: Disable pthread cancel point inside Logger destructor pthread_cancel is implemented in c++ using exception handlers. In destructor of Log object, the log function is called which will eventually call fputs() to write to a file. Since that function is considered a cancelation point, if pthread_cancel has been called the exception handler will start unstacking frames and calling destructors in the process. At some point this will cause a runtime exception in c++ which will call std::terminate() to abort the process. The solution is thus to avoid starting the cancellation process inside the destructor. This behavior was spotted while calling the destructor of Transceiver object in forthcoming patches. See a more detailed example here: https://skaark.wordpress.com/2010/08/26/pthread_cancel-considered-harmful/ Change-Id: I71ca90f3fbc73df58b878a03361f7b7831d838b4 --- M CommonLibs/Logger.cpp 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp index 393d882..171c635 100644 --- a/CommonLibs/Logger.cpp +++ b/CommonLibs/Logger.cpp @@ -44,6 +44,8 @@ Log::~Log() { + int old_state; + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state); int mlen = mStream.str().size(); int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n'); const char *fmt = neednl ? "%s\n" : "%s"; @@ -51,6 +53,7 @@ // The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers, // so just use std::cout. LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str()); + pthread_setcancelstate(old_state, NULL); } ostringstream& Log::get() -- To view, visit https://gerrit.osmocom.org/10739 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: I71ca90f3fbc73df58b878a03361f7b7831d838b4 Gerrit-Change-Number: 10739 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 Tue Sep 4 17:35:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:48 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10740 ) Change subject: cosmetic: Fix trailing whitespace ...................................................................... cosmetic: Fix trailing whitespace Change-Id: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index a377436..f74897f 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -239,7 +239,7 @@ else burstSize = symbolsPerSlot + (tN % 4 == 0); - /* + /* * Pre-allocate head room for the largest correlation size * so we can later avoid a re-allocation and copy * */ diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index ffcacdd..54ffc31 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -14,7 +14,7 @@ -#include "sigProcLib.h" +#include "sigProcLib.h" #include "GSMCommon.h" #include "LinkedLists.h" #include "radioDevice.h" @@ -130,7 +130,7 @@ /** set thread priority on current thread */ void setPriority(float prio = 0.5) { mRadio->setPriority(prio); } - /** get transport window type of attached device */ + /** get transport window type of attached device */ enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); } /** Minimum latency that the device can achieve */ 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 * -- To view, visit https://gerrit.osmocom.org/10740 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: Ia647cfed0acb35adeb9b3b7824170d06c0369ef7 Gerrit-Change-Number: 10740 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 Tue Sep 4 17:35:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:49 +0000 Subject: Change in osmo-trx[master]: radioInterface: forward errors from RadioDevice to Transceiver in rec... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10741 ) Change subject: radioInterface: forward errors from RadioDevice to Transceiver in recv path ...................................................................... radioInterface: forward errors from RadioDevice to Transceiver in recv path Change-Id: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9 --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp 4 files changed, 22 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index f74897f..b9c6672 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -218,14 +218,15 @@ while (pushBuffer()); } -bool RadioInterface::driveReceiveRadio() +int RadioInterface::driveReceiveRadio() { radioVector *burst = NULL; if (!mOn) - return false; + return 0; - pullBuffer(); + if (pullBuffer() < 0) + return -1; GSM::Time rcvClock = mClock.get(); rcvClock.decTN(receiveOffset); @@ -270,7 +271,7 @@ burstSize = (symbolsPerSlot + (tN % 4 == 0)) * mSPSRx; } - return true; + return 1; } bool RadioInterface::isUnderrun() @@ -300,13 +301,13 @@ } /* Receive a timestamped chunk from the device */ -void RadioInterface::pullBuffer() +int RadioInterface::pullBuffer() { bool local_underrun; size_t numRecv, segmentLen = recvBuffer[0]->getSegmentLen(); if (recvBuffer[0]->getFreeSegments() <= 0) - return; + return -1; /* Outer buffer access size is fixed */ numRecv = mRadio->readSamples(convertRecvBuffer, @@ -317,7 +318,7 @@ if (numRecv != segmentLen) { LOG(ALERT) << "Receive error " << numRecv; - return; + return -1; } for (size_t i = 0; i < mChans; i++) { @@ -328,6 +329,7 @@ underrun |= local_underrun; readTimestamp += numRecv; + return 0; } /* Send timestamped chunk to the device with arbitrary size */ diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 54ffc31..f19a8dc 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -71,7 +71,7 @@ virtual bool pushBuffer(void); /** pull GSM bursts from the receive buffer */ - virtual void pullBuffer(void); + virtual int pullBuffer(void); public: @@ -116,8 +116,8 @@ void driveTransmitRadio(std::vector &bursts, std::vector &zeros); - /** drive reception of GSM bursts */ - bool driveReceiveRadio(); + /** drive reception of GSM bursts. -1: Error. 0: Radio off. 1: Received something. */ + int driveReceiveRadio(); int setPowerAttenuation(int atten, size_t chan = 0); @@ -149,7 +149,7 @@ signalVector *outerRecvBuffer; bool pushBuffer(); - void pullBuffer(); + int pullBuffer(); public: RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps); @@ -162,7 +162,7 @@ class RadioInterfaceMulti : public RadioInterface { private: bool pushBuffer(); - void pullBuffer(); + int pullBuffer(); signalVector *outerSendBuffer; signalVector *outerRecvBuffer; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index b3add21..67ccb25 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -225,14 +225,14 @@ } /* Receive a timestamped chunk from the device */ -void RadioInterfaceMulti::pullBuffer() +int RadioInterfaceMulti::pullBuffer() { bool local_underrun; size_t num; float *buf; if (recvBuffer[0]->getFreeSegments() <= 0) - return; + return -1; /* Outer buffer access size is fixed */ num = mRadio->readSamples(convertRecvBuffer, @@ -242,7 +242,7 @@ &local_underrun); if (num != channelizer->inputLen()) { LOG(ALERT) << "Receive error " << num << ", " << channelizer->inputLen(); - return; + return -1; } convert_short_float((float *) outerRecvBuffer->begin(), @@ -288,6 +288,7 @@ LOG(ALERT) << "Sample rate upsampling error"; } } + return 0; } /* Send a timestamped chunk to the device */ diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp index b0f799e..8ae4aa1 100644 --- a/Transceiver52M/radioInterfaceResamp.cpp +++ b/Transceiver52M/radioInterfaceResamp.cpp @@ -160,13 +160,13 @@ } /* Receive a timestamped chunk from the device */ -void RadioInterfaceResamp::pullBuffer() +int RadioInterfaceResamp::pullBuffer() { bool local_underrun; int rc, num_recv; if (recvBuffer[0]->getFreeSegments() <= 0) - return; + return -1; /* Outer buffer access size is fixed */ num_recv = mRadio->readSamples(convertRecvBuffer, @@ -176,7 +176,7 @@ &local_underrun); if (num_recv != (int) resamp_outchunk) { LOG(ALERT) << "Receive error " << num_recv; - return; + return -1; } convert_short_float((float *) outerRecvBuffer->begin(), @@ -196,6 +196,7 @@ /* Set history for the next chunk */ outerRecvBuffer->updateHistory(); + return 0; } /* Send a timestamped chunk to the device */ -- To view, visit https://gerrit.osmocom.org/10741 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: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9 Gerrit-Change-Number: 10741 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 Tue Sep 4 17:35:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:49 +0000 Subject: Change in osmo-trx[master]: lms: Return error on device read timeout In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10742 ) Change subject: lms: Return error on device read timeout ...................................................................... lms: Return error on device read timeout If LImeSDR device is unplugged or its fw crashes during operation, reading from the device will fail and will first receive short reads and finally 0 byte reads. Let's quickly notify these events to upper layers instead of trying to process the buffer and checking timestamps for something we know it's already not useful. Related: OS#3340 Change-Id: Ib1af8cdd6cdadf581b039882add4049eea45a0f7 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 881cfb7..d8220ea 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -511,11 +511,13 @@ for (i = 0; i m_last_rx_underruns[i]) -- To view, visit https://gerrit.osmocom.org/10742 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: Ib1af8cdd6cdadf581b039882add4049eea45a0f7 Gerrit-Change-Number: 10742 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 Tue Sep 4 17:35:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:50 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly o... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10743 ) Change subject: osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error ...................................................................... osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error Transceiver::stop() can only be called from either CTRL iface thread or from main thread (running osmocom loop). That's because stop attempts to cancel and then join all the other threads, which would then lock if attempting to stop from some of them. As a result, the best option is to indicate to the user of the transceiver option (osmo-trx.cpp) to stop it in a correct fashion by destroying the object from the main thread. Change-Id: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 --- M CommonLibs/Makefile.am A CommonLibs/osmo_signal.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 5 files changed, 79 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/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 2332acb..3173397 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -49,4 +49,5 @@ Logger.h \ trx_vty.h \ debug.h \ + osmo_signal.h \ config_defs.h diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h new file mode 100644 index 0000000..00b8097 --- /dev/null +++ b/CommonLibs/osmo_signal.h @@ -0,0 +1,35 @@ +/* Generic signalling/notification infrastructure */ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#pragma once + +#include + +/* Signalling subsystems */ +enum signal_subsystems { + SS_TRANSC, +}; + +/* SS_TRANSC signals */ +enum SS_TRANSC { + S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be stopped */ +}; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index a1ebb30..cdfd79d 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -27,6 +27,10 @@ #include "Transceiver.h" #include +extern "C" { +#include "osmo_signal.h" +} + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -115,7 +119,7 @@ : mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress), mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100), mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface), - rssiOffset(wRssiOffset), + rssiOffset(wRssiOffset), sig_cbfn(NULL), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false), mForceClockInterface(false), mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0), mMaxExpectedDelayNB(0), mWriteBurstToDiskMask(0) @@ -219,6 +223,17 @@ return true; } +void Transceiver::setSignalHandler(osmo_signal_cbfn cbfn) +{ + if (this->sig_cbfn) + osmo_signal_unregister_handler(SS_TRANSC, this->sig_cbfn, NULL); + + if (cbfn) { + this->sig_cbfn = cbfn; + osmo_signal_register_handler(SS_TRANSC, this->sig_cbfn, NULL); + } +} + /* * Start the transceiver * @@ -885,8 +900,12 @@ void Transceiver::driveReceiveRadio() { - if (!mRadioInterface->driveReceiveRadio()) { + int rc = mRadioInterface->driveReceiveRadio(); + if (rc == 0) { usleep(100000); + } else if (rc < 0) { + LOG(FATAL) << "radio Interface receive failed, requesting stop."; + osmo_signal_dispatch(SS_TRANSC, S_TRANSC_STOP_REQUIRED, this); } else if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) { mForceClockInterface = false; writeClockInterface(); diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index f9b54f0..e250adc 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -31,6 +31,7 @@ #include extern "C" { +#include #include "config_defs.h" } @@ -128,6 +129,8 @@ /** accessor for number of channels */ size_t numChans() const { return mChans; }; + void setSignalHandler(osmo_signal_cbfn cbfn); + /** Codes for channel combinations */ typedef enum { FILL, ///< Channel is transmitted, but unused @@ -177,6 +180,8 @@ double rssiOffset; ///< RSSI to dBm conversion offset + osmo_signal_cbfn *sig_cbfn; ///< Registered Signal Handler to announce events. + /** modulate and add a burst to the transmit queue */ void addRadioVector(size_t chan, BitVector &bits, int RSSI, GSM::Time &wTime); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 1c40fcf..d01a4cf 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -55,6 +55,7 @@ #include "convert.h" #include "trx_vty.h" #include "debug.h" +#include "osmo_signal.h" } #define DEFAULT_CONFIG_FILE "osmo-trx.cfg" @@ -112,6 +113,20 @@ return radio; } +/* Callback function to be called every time we receive a signal from TRANSC */ +static int transc_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + switch (signal) { + case S_TRANSC_STOP_REQUIRED: + gshutdown = true; + break; + default: + break; + } + return 0; +} + /* Create transceiver core * The multi-threaded modem core operates at multiples of the GSM rate of * 270.8333 ksps and consists of GSM specific modulation, demodulation, @@ -132,6 +147,8 @@ return -1; } + transceiver->setSignalHandler(transc_sig_cb); + for (size_t i = 0; i < trx->cfg.num_chans; i++) { fifo = radio->receiveFIFO(i); if (fifo && transceiver->receiveFIFO(fifo, i)) -- To view, visit https://gerrit.osmocom.org/10743 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: Iac1d2dbe2328e735db2d4b933cb67b1af1babca1 Gerrit-Change-Number: 10743 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) 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 Tue Sep 4 17:35:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:35:50 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix variable storing integer return value In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10744 ) Change subject: radioInterface: Fix variable storing integer return value ...................................................................... radioInterface: Fix variable storing integer return value Change-Id: I0a0a06a6d16a228cfcb7bd746bab2d79f10ce244 --- M Transceiver52M/radioInterface.cpp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index b9c6672..7d6a03b 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -304,7 +304,8 @@ int RadioInterface::pullBuffer() { bool local_underrun; - size_t numRecv, segmentLen = recvBuffer[0]->getSegmentLen(); + int numRecv; + size_t segmentLen = recvBuffer[0]->getSegmentLen(); if (recvBuffer[0]->getFreeSegments() <= 0) return -1; @@ -316,7 +317,7 @@ readTimestamp, &local_underrun); - if (numRecv != segmentLen) { + if ((size_t) numRecv != segmentLen) { LOG(ALERT) << "Receive error " << numRecv; return -1; } -- To view, visit https://gerrit.osmocom.org/10744 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: I0a0a06a6d16a228cfcb7bd746bab2d79f10ce244 Gerrit-Change-Number: 10744 Gerrit-PatchSet: 3 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 Tue Sep 4 17:36:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:36:29 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: cosmetically re-arrange reply_to() args In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10746 ) Change subject: mgcp_client_test: cosmetically re-arrange reply_to() args ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10746 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: Ib2e718dda3aa1f6e9979dee823d973dd002e2318 Gerrit-Change-Number: 10746 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:36: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 Sep 4 17:38:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:38:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: use "\r\n\r\n" instead of "\n\n" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10747 ) Change subject: mgcp_client_test: use "\r\n\r\n" instead of "\n\n" ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10747/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10747/1//COMMIT_MSG at 9 PS1, Line 9: For some : reason the test so far used "\n\n" instead we once had trouble interoperating with a MSC from Zynetix which violated the MGCP RFC with respect to line endings. The original test may very well be originating there? -- To view, visit https://gerrit.osmocom.org/10747 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: I41c73722e5fae00663bcf96de0b57b7155809a06 Gerrit-Change-Number: 10747 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:38:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:38:59 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: also verify received conn_id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10748 ) Change subject: mgcp_client_test: also verify received conn_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10748 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: I6b9b18d4d0867febd75a4d29f8a2fcdf0553ae4c Gerrit-Change-Number: 10748 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17: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 Tue Sep 4 17:39:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:39:21 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: test long conn_id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10749 ) Change subject: mgcp_client_test: test long conn_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10749 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: I5f2d52f086ea2d330fcce88a176488ace972bf79 Gerrit-Change-Number: 10749 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:39: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 Sep 4 17:39:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:39:39 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: error on too long conn id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10750 ) Change subject: mgcp_client: error on too long conn id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10750 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: If2a1aab1f13e771a6705c430e3c75bd42477a23b Gerrit-Change-Number: 10750 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:39:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Sep 4 17:39:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Sep 2018 17:39:55 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sys?= =?UTF-8?Q?mo,superfemto=5Fv5.1,default,osmocom-master-debian9_#1115?= In-Reply-To: <1140377302.130.1536061641958.JavaMail.jenkins@jenkins.osmocom.org> References: <1140377302.130.1536061641958.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <644525556.135.1536082795399.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Sep 4 17:39:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:39:59 +0000 Subject: Change in osmo-mgw[master]: mgcp_common: rename to MGCP_CONN_ID_MAXLEN In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10751 ) Change subject: mgcp_common: rename to MGCP_CONN_ID_MAXLEN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10751 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: I1117003c7614e98535d5c201d002e459c01bdc3f Gerrit-Change-Number: 10751 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:39: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 Sep 4 17:40:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:40:45 +0000 Subject: Change in osmo-mgw[master]: doc: fix mgcp_verify_ci() return val doc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10752 ) Change subject: doc: fix mgcp_verify_ci() return val doc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10752 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: I6f89abd56ffcda8ba0276db1bc3381fa372e35a4 Gerrit-Change-Number: 10752 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:40: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 Sep 4 17:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:41:08 +0000 Subject: Change in osmo-mgw[master]: mgcp_verify_ci(): return meaningful error codes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10753 ) Change subject: mgcp_verify_ci(): return meaningful error codes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10753 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: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6 Gerrit-Change-Number: 10753 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:41: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 Sep 4 17:43:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:43:07 +0000 Subject: Change in osmo-mgw[master]: fix mgcp_verify_ci(): off-by-one in max len check In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10754 ) Change subject: fix mgcp_verify_ci(): off-by-one in max len check ...................................................................... Patch Set 1: Code-Review+2 I think the proper approach is to have MAXLEN to be 32 and only use MAXLEN+1 when sizing the array. But well, up to you. -- To view, visit https://gerrit.osmocom.org/10754 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: I8d6cc96be252bb486e94f343a8c7cae641ff9429 Gerrit-Change-Number: 10754 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17:43: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 Sep 4 17:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Sep 2018 17:43:42 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log HR2 specifically as never specified In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10756 ) Change subject: codec_pref: Log HR2 specifically as never specified ...................................................................... codec_pref: Log HR2 specifically as never specified Change-Id: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e --- M src/osmo-bsc/codec_pref.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 212c2a6..cbe8ef4 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -35,7 +35,6 @@ case GSM0808_PERM_FR1: return GSM48_CMODE_SPEECH_V1; break; - case GSM0808_PERM_HR2: case GSM0808_PERM_FR2: return GSM48_CMODE_SPEECH_EFR; break; @@ -43,6 +42,8 @@ case GSM0808_PERM_FR3: return GSM48_CMODE_SPEECH_AMR; break; + case GSM0808_PERM_HR2: + LOGP(DMSC, LOGL_FATAL, "Speech HR2 was never specified!\n"); default: LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech %s selected, " "assuming AMR as channel mode...\n", -- To view, visit https://gerrit.osmocom.org/10756 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: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e Gerrit-Change-Number: 10756 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 Tue Sep 4 17:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:56:11 +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 3: Code-Review+2 -- 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: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Sep 2018 17:56: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 Sep 4 17:56:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 17:56:48 +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 3: 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: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 17: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 Tue Sep 4 18:00:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 18:00:55 +0000 Subject: Change in osmo-trx[master]: configure.ac: Specify default language as C++ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10745 ) Change subject: configure.ac: Specify default language as C++ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10745 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: Iee757c78b72290c5d2a4c31339800a4e72b6be23 Gerrit-Change-Number: 10745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 18:00: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 Sep 4 18:00:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 18:00:57 +0000 Subject: Change in osmo-trx[master]: configure.ac: Specify default language as C++ In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10745 ) Change subject: configure.ac: Specify default language as C++ ...................................................................... configure.ac: Specify default language as C++ This is useful if we add more AC_CHECK_HEADER or similar configure tests including C++ header files or required C++ features, since otherwise gcc is used by default and test fail. Change-Id: Iee757c78b72290c5d2a4c31339800a4e72b6be23 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index e1cc121..daa8677 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,7 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PATH_PROG([RM_PROG], [rm]) +AC_LANG([C++]) dnl check for pkg-config (explained in detail in libosmocore/configure.ac) AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) -- To view, visit https://gerrit.osmocom.org/10745 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: Iee757c78b72290c5d2a4c31339800a4e72b6be23 Gerrit-Change-Number: 10745 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 Tue Sep 4 18:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 18:01:34 +0000 Subject: Change in osmo-trx[master]: update git-version-gen to generate proper version numbers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10759 ) Change subject: update git-version-gen to generate proper version numbers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10759 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: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b Gerrit-Change-Number: 10759 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Sep 2018 18:01: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 Sep 4 18:01:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 18:01:35 +0000 Subject: Change in osmo-trx[master]: update git-version-gen to generate proper version numbers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10759 ) Change subject: update git-version-gen to generate proper version numbers ...................................................................... update git-version-gen to generate proper version numbers We don't want the version of the last tagged version, but the version number uniquely representing the current HEAD. Use the script from libosmocore. I suspect that this somehow got broken in commit 00d5114717040fedd443e3f723385ede434c8b39 Related: OS#3517 Change-Id: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b --- M git-version-gen 1 file changed, 2 insertions(+), 1 deletion(-) 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/git-version-gen b/git-version-gen index 51d4bf7..42cf3d2 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,7 +93,8 @@ then : # use $v elif - v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \ + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; -- To view, visit https://gerrit.osmocom.org/10759 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: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b Gerrit-Change-Number: 10759 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte 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 Tue Sep 4 19:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 19:20:42 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10770 Change subject: apps/grgsm_trx: add baseband frequency shift feature ...................................................................... apps/grgsm_trx: add baseband frequency shift feature An ability to shift the baseband frequency would allow one to run both base stations and (OsmocomBB-based) mobile stations on any frequency (e.g. in 2.4 GHz WiFi band)! This is achieved by adding a given frequency offset to the result of "ARFCN -> RX/TX frequency" calculation. Usage example: grgsm_trx --freq-offset -500M Both RX (Downlink) and TX (Uplink) frequencies will be shifted by 500 MHz back, e.g. tuning request to ARFCN 105 would result in tuning the radio to 456.0 MHz (instead of 956.0 MHz). Related: OS#3520 (https://osmocom.org/versions/136) Change-Id: I42e397e47402a87f4141ef31b25eff4c8c1267e2 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/70/10770/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 1c0581f..45312e6 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -25,6 +25,8 @@ import getopt import sys +from gnuradio import eng_notation + from grgsm.trx import ctrl_if_bb from grgsm.trx import radio_if from grgsm.trx import fake_pm @@ -45,6 +47,7 @@ # PHY specific phy_sample_rate = 4 * 1625000 / 6 + phy_freq_offset_hz = None phy_tx_antenna = "TX/RX" phy_rx_antenna = "RX2" phy_rx_gain = 30 @@ -67,6 +70,10 @@ self.bind_addr, self.remote_addr, self.base_port) + # Optional frequency offset + if self.phy_freq_offset_hz is not None: + self.radio.freq_offset_hz = self.phy_freq_offset_hz + # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 @@ -110,6 +117,7 @@ " -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" \ + " --freq-offset Shift baseband freq. (e.g. -500M)\n" \ " --ppm Set frequency correction (default %d)\n" print(s % ( @@ -128,7 +136,7 @@ "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="]) + "ppm=", "rx-antenna=", "tx-antenna=", "freq-offset="]) except getopt.GetoptError as err: # Print(help and exit) self.print_help() @@ -167,6 +175,10 @@ self.phy_tx_antenna = v elif o in ("--ppm"): self.phy_ppm = int(v) + elif o in ("--freq-offset"): + # Convert /\d+(\.\d+)?(M|k)?/ to Hz + offset_hz = eng_notation.str_to_num(v) + self.phy_freq_offset_hz = offset_hz def sig_handler(self, signum, frame): print("Signal %d received" % signum) diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index d2afcf6..71d771b 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -4,7 +4,7 @@ # GR-GSM based transceiver # Follow graph implementation # -# (C) 2016-2017 by Vadim Yanitskiy +# (C) 2016-2018 by Vadim Yanitskiy # (C) 2017 by Piotr Krysik # # All Rights Reserved @@ -59,6 +59,7 @@ class radio_if(gr.top_block): # PHY specific variables + freq_offset_hz = None rx_freq = 935e6 tx_freq = 890e6 osr = 4 @@ -274,11 +275,19 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): + if self.freq_offset_hz is not None: + fc += self.freq_offset_hz + print("[#] Shifting RX freq. to %d MHz (offset is %d Hz)" + % (fc / 1e6, self.freq_offset_hz)) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): + if self.freq_offset_hz is not None: + fc += self.freq_offset_hz + print("[#] Shifting TX freq. to %d MHz (offset is %d Hz)" + % (fc / 1e6, self.freq_offset_hz)) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/10770 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: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 19:36:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 19:36:16 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature In-Reply-To: References: Message-ID: Hello Piotr Krysik, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10770 to look at the new patch set (#2). Change subject: apps/grgsm_trx: add baseband frequency shift feature ...................................................................... apps/grgsm_trx: add baseband frequency shift feature An ability to shift the baseband frequency would allow one to run both base stations and (OsmocomBB-based) mobile stations on any frequency (e.g. in 2.4 GHz WiFi band)! This is achieved by adding a given frequency offset to the result of "ARFCN -> RX/TX frequency" calculation. Usage example: grgsm_trx --freq-offset -500M Both RX (Downlink) and TX (Uplink) frequencies will be shifted by 500 MHz back, e.g. tuning request to ARFCN 105 would result in tuning the radio to 456.0 MHz (instead of 956.0 MHz). Related: OS#3520 (https://osmocom.org/versions/136) Change-Id: I42e397e47402a87f4141ef31b25eff4c8c1267e2 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 26 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/70/10770/2 -- To view, visit https://gerrit.osmocom.org/10770 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: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 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 Tue Sep 4 20:00:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 20:00:18 +0000 Subject: Change in libosmocore[master]: core/utils.h: drop duplicate '' include Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10771 Change subject: core/utils.h: drop duplicate '' include ...................................................................... core/utils.h: drop duplicate '' include Change-Id: I0979ddda91c4c0aa080b714cf2a698d7634f5091 --- M include/osmocom/core/utils.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10771/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index e2d5134..10063cb 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -30,7 +30,6 @@ /*! Copy a C-string into a sized buffer using sizeof to detect buffer's size */ #define OSMO_STRLCPY_ARRAY(array, src) osmo_strlcpy(array, src, sizeof(array)) -#include #include #include -- To view, visit https://gerrit.osmocom.org/10771 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: I0979ddda91c4c0aa080b714cf2a698d7634f5091 Gerrit-Change-Number: 10771 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 20:00:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Sep 2018 20:00:18 +0000 Subject: Change in libosmocore[master]: core/utils.h: move includes to the top Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10772 Change subject: core/utils.h: move includes to the top ...................................................................... core/utils.h: move includes to the top Having all inculdes listed in one place is a common good practice, which prevents one from adding duplicates. Change-Id: I3f52189d5e8f9afafc39525e95385a085f8f850a --- M include/osmocom/core/utils.h 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/10772/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 10063cb..976d4a8 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -1,6 +1,8 @@ #pragma once #include +#include +#include #include #include @@ -30,9 +32,6 @@ /*! Copy a C-string into a sized buffer using sizeof to detect buffer's size */ #define OSMO_STRLCPY_ARRAY(array, src) osmo_strlcpy(array, src, sizeof(array)) -#include -#include - /*! A mapping between human-readable string and numeric value */ struct value_string { unsigned int value; /*!< numeric value */ -- To view, visit https://gerrit.osmocom.org/10772 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: I3f52189d5e8f9afafc39525e95385a085f8f850a Gerrit-Change-Number: 10772 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 20:31:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 20:31:43 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Log HR2 specifically as never specified In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10756 ) Change subject: codec_pref: Log HR2 specifically as never specified ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10756/1/src/osmo-bsc/codec_pref.c File src/osmo-bsc/codec_pref.c: https://gerrit.osmocom.org/#/c/10756/1/src/osmo-bsc/codec_pref.c at 46 PS1, Line 46: LOGP > Yes, it has been moved here just to provide extra information on why the speech is unsupported. [?] I think that comment would at very least avoid any coverity warning -- To view, visit https://gerrit.osmocom.org/10756 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: Ia7d6545710b4bf609c2872e13dcb3b44abfc604e Gerrit-Change-Number: 10756 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: Tue, 04 Sep 2018 20:31:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 4 20:32:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 20:32:01 +0000 Subject: Change in libosmocore[master]: core/utils.h: drop duplicate '' include In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10771 ) Change subject: core/utils.h: drop duplicate '' include ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10771 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: I0979ddda91c4c0aa080b714cf2a698d7634f5091 Gerrit-Change-Number: 10771 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 20:32: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 Sep 4 20:32:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 20:32:03 +0000 Subject: Change in libosmocore[master]: core/utils.h: drop duplicate '' include In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10771 ) Change subject: core/utils.h: drop duplicate '' include ...................................................................... core/utils.h: drop duplicate '' include Change-Id: I0979ddda91c4c0aa080b714cf2a698d7634f5091 --- M include/osmocom/core/utils.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index e2d5134..10063cb 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -30,7 +30,6 @@ /*! Copy a C-string into a sized buffer using sizeof to detect buffer's size */ #define OSMO_STRLCPY_ARRAY(array, src) osmo_strlcpy(array, src, sizeof(array)) -#include #include #include -- To view, visit https://gerrit.osmocom.org/10771 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: I0979ddda91c4c0aa080b714cf2a698d7634f5091 Gerrit-Change-Number: 10771 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 4 20:32:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 20:32:08 +0000 Subject: Change in libosmocore[master]: core/utils.h: move includes to the top In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10772 ) Change subject: core/utils.h: move includes to the top ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10772 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: I3f52189d5e8f9afafc39525e95385a085f8f850a Gerrit-Change-Number: 10772 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Sep 2018 20:32: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 Sep 4 20:32:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Sep 2018 20:32:10 +0000 Subject: Change in libosmocore[master]: core/utils.h: move includes to the top In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10772 ) Change subject: core/utils.h: move includes to the top ...................................................................... core/utils.h: move includes to the top Having all inculdes listed in one place is a common good practice, which prevents one from adding duplicates. Change-Id: I3f52189d5e8f9afafc39525e95385a085f8f850a --- M include/osmocom/core/utils.h 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 10063cb..976d4a8 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -1,6 +1,8 @@ #pragma once #include +#include +#include #include #include @@ -30,9 +32,6 @@ /*! Copy a C-string into a sized buffer using sizeof to detect buffer's size */ #define OSMO_STRLCPY_ARRAY(array, src) osmo_strlcpy(array, src, sizeof(array)) -#include -#include - /*! A mapping between human-readable string and numeric value */ struct value_string { unsigned int value; /*!< numeric value */ -- To view, visit https://gerrit.osmocom.org/10772 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: I3f52189d5e8f9afafc39525e95385a085f8f850a Gerrit-Change-Number: 10772 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 5 07:55:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 07:55:01 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10770 ) Change subject: apps/grgsm_trx: add baseband frequency shift feature ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10770 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: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Wed, 05 Sep 2018 07:55:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 07:58:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 07:58:38 +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+1 What do you actually need in terms of config? Only the vty bind to 0.0.0.0? I think the future proof way would be to use a small script (python?) which patches thee example config. This way the doc/examples confg can be used with one small incremental delta. -- 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: Wed, 05 Sep 2018 07:58:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 08:01:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 08:01:30 +0000 Subject: Change in osmocom-bb[master]: trxcon: suppress WARNING log message on NEIGH_PM_REQ In-Reply-To: References: Message-ID: Harald Welte 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: I'd still like to see this merged. Its how I generally approach switch statements related to message types in osmocom. But of course, trxcon is your project and you get to decide. Please consider either merging or abandoning. Thanks! -- 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: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Sep 2018 08:01:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 09:53:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 09:53:03 +0000 Subject: Change in osmocom-bb[master]: trxcon: distinguish between unimplemented and unknonw messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: distinguish between unimplemented and unknonw messages ...................................................................... trxcon: distinguish between unimplemented and unknonw messages Let's differentiate between 'expected' unimplemented messages like L1CTL_NEIGH_PM_REQ and truly unknonw message types. Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 --- M src/host/trxcon/l1ctl.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/10432/2 -- 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: newpatchset Gerrit-Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 Gerrit-Change-Number: 10432 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte 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 Sep 5 09:54:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 09:54:01 +0000 Subject: Change in osmocom-bb[master]: trxcon: distinguish between unimplemented and unknonw messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: distinguish between unimplemented and unknonw messages ...................................................................... Patch Set 2: Code-Review+1 > I'd still like to see this merged. Its how I generally approach > switch statements related to message types in osmocom. But of > course, trxcon is your project and you get to decide. Please > consider either merging or abandoning. Thanks! Sure, let's merge this change. I have added some more message types. -- 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: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Sep 2018 09:54:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 10:30:44 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Wed, 5 Sep 2018 10:30:44 +0000 Subject: Change in gr-gsm[master]: Format the output into ostringstream and then write it at once. In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10731 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: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Wed, 05 Sep 2018 10:30:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 10:50:06 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Wed, 5 Sep 2018 10:50:06 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10770 ) Change subject: apps/grgsm_trx: add baseband frequency shift feature ...................................................................... Patch Set 2: Verified+1 Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10770/2/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10770/2/apps/grgsm_trx at 50 PS2, Line 50: phy_freq_offset_hz The way parameters (especially their default values) are handled currently is a bit messy. I'll migrate it to optparse or argparse. -- To view, visit https://gerrit.osmocom.org/10770 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: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Wed, 05 Sep 2018 10:50:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 10:53:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 10:53:29 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10770 ) Change subject: apps/grgsm_trx: add baseband frequency shift feature ...................................................................... Patch Set 2: I am agree, argparse would be better here. Feel free to send a change for review ;) -- To view, visit https://gerrit.osmocom.org/10770 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: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Sep 2018 10:53:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 10:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 10:53:37 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10770 ) Change subject: apps/grgsm_trx: add baseband frequency shift feature ...................................................................... apps/grgsm_trx: add baseband frequency shift feature An ability to shift the baseband frequency would allow one to run both base stations and (OsmocomBB-based) mobile stations on any frequency (e.g. in 2.4 GHz WiFi band)! This is achieved by adding a given frequency offset to the result of "ARFCN -> RX/TX frequency" calculation. Usage example: grgsm_trx --freq-offset -500M Both RX (Downlink) and TX (Uplink) frequencies will be shifted by 500 MHz back, e.g. tuning request to ARFCN 105 would result in tuning the radio to 456.0 MHz (instead of 956.0 MHz). Related: OS#3520 (https://osmocom.org/versions/136) Change-Id: I42e397e47402a87f4141ef31b25eff4c8c1267e2 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 26 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 1c0581f..45312e6 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -25,6 +25,8 @@ import getopt import sys +from gnuradio import eng_notation + from grgsm.trx import ctrl_if_bb from grgsm.trx import radio_if from grgsm.trx import fake_pm @@ -45,6 +47,7 @@ # PHY specific phy_sample_rate = 4 * 1625000 / 6 + phy_freq_offset_hz = None phy_tx_antenna = "TX/RX" phy_rx_antenna = "RX2" phy_rx_gain = 30 @@ -67,6 +70,10 @@ self.bind_addr, self.remote_addr, self.base_port) + # Optional frequency offset + if self.phy_freq_offset_hz is not None: + self.radio.freq_offset_hz = self.phy_freq_offset_hz + # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 @@ -110,6 +117,7 @@ " -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" \ + " --freq-offset Shift baseband freq. (e.g. -500M)\n" \ " --ppm Set frequency correction (default %d)\n" print(s % ( @@ -128,7 +136,7 @@ "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="]) + "ppm=", "rx-antenna=", "tx-antenna=", "freq-offset="]) except getopt.GetoptError as err: # Print(help and exit) self.print_help() @@ -167,6 +175,10 @@ self.phy_tx_antenna = v elif o in ("--ppm"): self.phy_ppm = int(v) + elif o in ("--freq-offset"): + # Convert /\d+(\.\d+)?(M|k)?/ to Hz + offset_hz = eng_notation.str_to_num(v) + self.phy_freq_offset_hz = offset_hz def sig_handler(self, signum, frame): print("Signal %d received" % signum) diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index d2afcf6..407e724 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -4,7 +4,7 @@ # GR-GSM based transceiver # Follow graph implementation # -# (C) 2016-2017 by Vadim Yanitskiy +# (C) 2016-2018 by Vadim Yanitskiy # (C) 2017 by Piotr Krysik # # All Rights Reserved @@ -29,6 +29,7 @@ from math import pi +from gnuradio import eng_notation from gnuradio import digital from gnuradio import blocks from gnuradio import uhd @@ -59,6 +60,7 @@ class radio_if(gr.top_block): # PHY specific variables + freq_offset_hz = None rx_freq = 935e6 tx_freq = 890e6 osr = 4 @@ -274,11 +276,21 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): + if self.freq_offset_hz is not None: + fc += self.freq_offset_hz + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): + if self.freq_offset_hz is not None: + fc += self.freq_offset_hz + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/10770 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: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 Gerrit-PatchSet: 2 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 Wed Sep 5 11:32:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Wed, 5 Sep 2018 11:32:47 +0000 Subject: Change in gr-gsm[master]: Format the output into ostringstream and then write it at once. In-Reply-To: References: Message-ID: Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. ...................................................................... Patch Set 1: Hi Piotr, Despite the +2 this is still not merged, is there something I still need to do? -- To view, visit https://gerrit.osmocom.org/10731 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: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Wed, 05 Sep 2018 11:32:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 12:41:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Sep 2018 12:41:10 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/10773 Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Fix "'laforge/debian-jessie-build' not found" Instead of hardcoding laforge's username in all FROM statements in the Dockerfiles, make use of the USER variable. Thanks to fixeria for proposing this fix! This requires running docker-ce, old versions of docker (such as the one in the official repositories of the latest Fedora) don't support variables in the FROM line. But docker-ce can be installed after adding docker's 3rd party repositories. Closes: OS#3457 Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f --- M debian-jessie-buildslave-st/Dockerfile M debian-jessie-buildslave/Dockerfile M osmo-bsc-master/Dockerfile M osmo-bts-master/Dockerfile M osmo-gerrit-libosmo/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-mgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-nitb-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmocom-bb-host-master/Dockerfile M sctp-test/Dockerfile M sigtran-tests/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile 26 files changed, 52 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/73/10773/1 diff --git a/debian-jessie-buildslave-st/Dockerfile b/debian-jessie-buildslave-st/Dockerfile index 0f1b435..2d2c985 100644 --- a/debian-jessie-buildslave-st/Dockerfile +++ b/debian-jessie-buildslave-st/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-buildslave +ARG USER +FROM $USER/debian-jessie-buildslave RUN apt-get -y install \ libffi-dev \ diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile index 70eab38..158e19e 100644 --- a/debian-jessie-buildslave/Dockerfile +++ b/debian-jessie-buildslave/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index c36fe66..5c76688 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 3c2dbec..69a8d4c 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile index ac89bbe..5442703 100644 --- a/osmo-gerrit-libosmo/Dockerfile +++ b/osmo-gerrit-libosmo/Dockerfile @@ -3,7 +3,8 @@ # projects, and then simply 'git pull' + build the given project # that we want to compile-test at 'docker run' time (in tmpfs) -FROM laforge/debian-jessie-buildslave +ARG USER +FROM $USER/debian-jessie-buildslave MAINTAINER Harald Welte diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index dd9f07a..5acdf98 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index 68c3b43..45c3bd5 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 4c60917..c00d68b 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 9dc2813..2c9469e 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 3ecbb2a..fe40d78 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index f7648a7..94563b1 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 738987a..841e324 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 55a984c..e69cbc7 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 7c11d91..ae93c10 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 19cc772..0cede4b 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index b39a459..fe5db70 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile index 452e169..b09fa09 100644 --- a/sigtran-tests/Dockerfile +++ b/sigtran-tests/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 9bdc898..29a121a 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 3fec55b..1f5b47c 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 4e5e2da..5ca917b 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 0dee3d3..afa17fc 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 6460c0a..e2327b7 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index bbc60a2..f812ee0 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 8cd9e58..a50a434 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index d06195d..038a765 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 7d566b9..d7ea0db 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 12:58:04 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Sep 2018 12:58:04 +0000 Subject: Change in osmo-bsc[master]: assignment: remove unnecessary call to gsm0808_speech_codec_from_chan... Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10774 Change subject: assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() ...................................................................... assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() There is a function call to gsm0808_speech_codec_from_chan_type() after an if construct that checks if we need voice and if we need it if it is related to an AoIP connection. However, at the moment we call gsm0808_speech_codec_from_chan_type() all the time, even when just figured out that we don't need to. Presumably this is a refactory leftover. Lets remove the excess function call. Change-Id: I34d9281944b36cd89ad8e1c5774f0ea80fdfadc8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/10774/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 41615ac..e1da45b 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -171,8 +171,6 @@ /* FIXME: AMR codec configuration must be derived from lchan1! */ } - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, chosen_channel, lchan->encr.alg_id, perm_spch, -- To view, visit https://gerrit.osmocom.org/10774 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: I34d9281944b36cd89ad8e1c5774f0ea80fdfadc8 Gerrit-Change-Number: 10774 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 13:18:03 2018 From: gerrit-no-reply at lists.osmocom.org (Ivan Kluchnikov) Date: Wed, 5 Sep 2018 13:18:03 +0000 Subject: Change in libosmocore[master]: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. In-Reply-To: References: Message-ID: Ivan Kluchnikov has uploaded a new patch set (#3) to the change originally created by Alexander Chemeris. ( https://gerrit.osmocom.org/9997 ) Change subject: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. ...................................................................... coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. They consist of two blocks, so we should count both blocks. Change-Id: I560de192212dae4705054a1665726369b83d213a --- M src/coding/gsm0503_coding.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/9997/3 -- To view, visit https://gerrit.osmocom.org/9997 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: I560de192212dae4705054a1665726369b83d213a Gerrit-Change-Number: 9997 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 13:18:03 2018 From: gerrit-no-reply at lists.osmocom.org (Ivan Kluchnikov) Date: Wed, 5 Sep 2018 13:18:03 +0000 Subject: Change in libosmocore[master]: coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). In-Reply-To: References: Message-ID: Ivan Kluchnikov has uploaded a new patch set (#2) to the change originally created by Alexander Chemeris. ( https://gerrit.osmocom.org/9996 ) Change subject: coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). ...................................................................... coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). Previsouly there were a lot of valid code paths which returned from the function before setting bit counters which led to bogus BER output in osmo-bts-trx logs when those code paths were hit. Change-Id: I4722cae3794ccbb12001113c991d9cf345a52a96 --- M src/coding/gsm0503_coding.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/9996/2 -- To view, visit https://gerrit.osmocom.org/9996 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: I4722cae3794ccbb12001113c991d9cf345a52a96 Gerrit-Change-Number: 9996 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 14:11:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 14:11:53 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10773 ) Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Patch Set 1: Code-Review+1 Thanks! -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Sep 2018 14:11: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 Sep 5 14:17:28 2018 From: gerrit-no-reply at lists.osmocom.org (Ivan Kluchnikov) Date: Wed, 5 Sep 2018 14:17:28 +0000 Subject: Change in libosmocore[master]: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. In-Reply-To: References: Message-ID: Ivan Kluchnikov has posted comments on this change. ( https://gerrit.osmocom.org/9997 ) Change subject: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. ...................................................................... Patch Set 3: Hi Harald, I have applied cosmetic changes for these patches as you requested above. -- To view, visit https://gerrit.osmocom.org/9997 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: I560de192212dae4705054a1665726369b83d213a Gerrit-Change-Number: 9997 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Sep 2018 14:17:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 15:51:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 15:51:46 +0000 Subject: Change in osmocom-bb[master]: trxcon: distinguish between unimplemented and unknown messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#3) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: distinguish between unimplemented and unknown messages ...................................................................... trxcon: distinguish between unimplemented and unknown messages Let's differentiate between 'expected' unimplemented messages like L1CTL_NEIGH_PM_REQ and truly unknonw message types. Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 --- M src/host/trxcon/l1ctl.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/10432/3 -- 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: newpatchset Gerrit-Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 Gerrit-Change-Number: 10432 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte 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 Sep 5 18:33:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Sep 2018 18:33:19 +0000 Subject: Change in osmo-bsc[master]: codec_pref.c: Add comment in expected switch case without break Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10775 Change subject: codec_pref.c: Add comment in expected switch case without break ...................................................................... codec_pref.c: Add comment in expected switch case without break Change-Id: I568353f070f049003326306106dce89b35deb92f --- M src/osmo-bsc/codec_pref.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/10775/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index cbe8ef4..2a9be6e 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -44,6 +44,7 @@ break; case GSM0808_PERM_HR2: LOGP(DMSC, LOGL_FATAL, "Speech HR2 was never specified!\n"); + /* fall through */ default: LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech %s selected, " "assuming AMR as channel mode...\n", -- To view, visit https://gerrit.osmocom.org/10775 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: I568353f070f049003326306106dce89b35deb92f Gerrit-Change-Number: 10775 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 Sep 5 19:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:23:19 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: drop meaningless 'tn > 7' checks Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10776 Change subject: trxcon/l1ctl.c: drop meaningless 'tn > 7' checks ...................................................................... trxcon/l1ctl.c: drop meaningless 'tn > 7' checks There is no need to check the range of timeslot number, which is decoded from GSM 08.58 channel number (9.3.1) by applying 0x07 mask, because any result of this operation is always within the correct range. Change-Id: Ib84417099d303bd3ae3557f48a5c40b812c6cdfc --- M src/host/trxcon/l1ctl.c 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/10776/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 74400be..ec8b4c7 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -565,11 +565,6 @@ /* Determine TS index */ tn = chan_nr & 0x7; - if (tn > 7) { - LOGP(DL1C, LOGL_ERROR, "Incorrect TS index %u\n", tn); - rc = -EINVAL; - goto exit; - } /* Configure requested TS */ rc = sched_trx_configure_ts(l1l->trx, tn, config); @@ -732,11 +727,6 @@ /* Determine TS index */ tn = ul->chan_nr & 0x7; - if (tn > 7) { - LOGP(DL1C, LOGL_ERROR, "Incorrect TS index %u\n", tn); - rc = -EINVAL; - goto exit; - } /* Make sure that required TS is allocated and configured */ ts = l1l->trx->ts_list[tn]; -- To view, visit https://gerrit.osmocom.org/10776 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: Ib84417099d303bd3ae3557f48a5c40b812c6cdfc Gerrit-Change-Number: 10776 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:23:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:23:20 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10777 Change subject: trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ ...................................................................... trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ Change-Id: If092743c32b7a6f5da7c8339b0f7b92ccf8a7a8b --- M src/host/trxcon/l1ctl.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/10777/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index ec8b4c7..9d6871e 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -541,10 +541,12 @@ band_arfcn = ntohs(est_req->h0.band_arfcn); chan_nr = ul->chan_nr; + tn = chan_nr & 0x07; LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ (arfcn=%u, " - "chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", (band_arfcn &~ ARFCN_FLAG_MASK), - chan_nr, est_req->tsc, est_req->tch_mode); + "tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", + (band_arfcn &~ ARFCN_FLAG_MASK), tn, chan_nr, + est_req->tsc, est_req->tch_mode); if (est_req->h) { LOGP(DL1C, LOGL_ERROR, "FHSS is not supported\n"); @@ -563,9 +565,6 @@ goto exit; } - /* Determine TS index */ - tn = chan_nr & 0x7; - /* Configure requested TS */ rc = sched_trx_configure_ts(l1l->trx, tn, config); ts = l1l->trx->ts_list[tn]; -- To view, visit https://gerrit.osmocom.org/10777 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: If092743c32b7a6f5da7c8339b0f7b92ccf8a7a8b Gerrit-Change-Number: 10777 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:23:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:23:20 +0000 Subject: Change in osmocom-bb[master]: trxcon: avoid arfcn / band_arfcn naming confusion Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10778 Change subject: trxcon: avoid arfcn / band_arfcn naming confusion ...................................................................... trxcon: avoid arfcn / band_arfcn naming confusion In the most cases an ARFCN value is stored together with some flags (e.g. DL/UL flag, DCS flag), so it should be taken into account e.g. when printing. Let's use the proper naming. Change-Id: I0b7634c80986dbff9d0da421c6a044cd36c9fd01 --- M src/host/trxcon/l1ctl.c M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h 3 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/10778/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 9d6871e..49d6a12 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -349,7 +349,7 @@ static int l1ctl_rx_pm_req(struct l1ctl_link *l1l, struct msgb *msg) { - uint16_t arfcn_start, arfcn_stop; + uint16_t band_arfcn_start, band_arfcn_stop; struct l1ctl_pm_req *pmr; int rc = 0; @@ -361,17 +361,17 @@ goto exit; } - arfcn_start = ntohs(pmr->range.band_arfcn_from); - arfcn_stop = ntohs(pmr->range.band_arfcn_to); + band_arfcn_start = ntohs(pmr->range.band_arfcn_from); + band_arfcn_stop = ntohs(pmr->range.band_arfcn_to); LOGP(DL1C, LOGL_NOTICE, "Received power measurement " "request (%s: %d -> %d)\n", - gsm_band_name(gsm_arfcn2band(arfcn_start)), - arfcn_start &~ ARFCN_FLAG_MASK, - arfcn_stop &~ ARFCN_FLAG_MASK); + gsm_band_name(gsm_arfcn2band(band_arfcn_start)), + band_arfcn_start &~ ARFCN_FLAG_MASK, + band_arfcn_stop &~ ARFCN_FLAG_MASK); /* Send measurement request to transceiver */ - rc = trx_if_cmd_measure(l1l->trx, arfcn_start, arfcn_stop); + rc = trx_if_cmd_measure(l1l->trx, band_arfcn_start, band_arfcn_stop); exit: msgb_free(msg); diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index cab5a9b..e08857c 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -310,28 +310,28 @@ * RSP (RX/TX)TUNE */ -int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t arfcn) +int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn) { uint16_t freq10; /* RX is downlink on MS side */ - freq10 = gsm_arfcn2freq10(arfcn, 0); + freq10 = gsm_arfcn2freq10(band_arfcn, 0); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn); + LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); return -ENOTSUP; } return trx_ctrl_cmd(trx, 1, "RXTUNE", "%d", freq10 * 100); } -int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t arfcn) +int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn) { uint16_t freq10; /* TX is uplink on MS side */ - freq10 = gsm_arfcn2freq10(arfcn, 1); + freq10 = gsm_arfcn2freq10(band_arfcn, 1); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn); + LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); return -ENOTSUP; } @@ -351,18 +351,18 @@ */ int trx_if_cmd_measure(struct trx_instance *trx, - uint16_t arfcn_start, uint16_t arfcn_stop) + uint16_t band_arfcn_start, uint16_t band_arfcn_stop) { uint16_t freq10; /* Update ARFCN range for measurement */ - trx->pm_arfcn_start = arfcn_start; - trx->pm_arfcn_stop = arfcn_stop; + trx->pm_band_arfcn_start = band_arfcn_start; + trx->pm_band_arfcn_stop = band_arfcn_stop; /* Calculate a frequency for current ARFCN (DL) */ - freq10 = gsm_arfcn2freq10(arfcn_start, 0); + freq10 = gsm_arfcn2freq10(band_arfcn_start, 0); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn_start); + LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn_start); return -ENOTSUP; } @@ -372,7 +372,7 @@ static void trx_if_measure_rsp_cb(struct trx_instance *trx, char *resp) { unsigned int freq10; - uint16_t arfcn; + uint16_t band_arfcn; int dbm; /* Parse freq. and power level */ @@ -380,22 +380,22 @@ freq10 /= 100; /* Check received ARFCN against expected */ - arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); - if (arfcn != trx->pm_arfcn_start) { + band_arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); + if (band_arfcn != trx->pm_band_arfcn_start) { LOGP(DTRX, LOGL_ERROR, "Power measurement error: " "response ARFCN=%u doesn't match expected ARFCN=%u\n", - arfcn &~ ARFCN_FLAG_MASK, - trx->pm_arfcn_start &~ ARFCN_FLAG_MASK); + band_arfcn &~ ARFCN_FLAG_MASK, + trx->pm_band_arfcn_start &~ ARFCN_FLAG_MASK); return; } /* Send L1CTL_PM_CONF */ - l1ctl_tx_pm_conf(trx->l1l, arfcn, dbm, - arfcn == trx->pm_arfcn_stop); + l1ctl_tx_pm_conf(trx->l1l, band_arfcn, dbm, + band_arfcn == trx->pm_band_arfcn_stop); /* Schedule a next measurement */ - if (arfcn != trx->pm_arfcn_stop) - trx_if_cmd_measure(trx, ++arfcn, trx->pm_arfcn_stop); + if (band_arfcn != trx->pm_band_arfcn_stop) + trx_if_cmd_measure(trx, ++band_arfcn, trx->pm_band_arfcn_stop); } /* diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index 6080dce..ed6bd3f 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -28,8 +28,8 @@ uint32_t prev_state; /* GSM L1 specific */ - uint16_t pm_arfcn_start; - uint16_t pm_arfcn_stop; + uint16_t pm_band_arfcn_start; + uint16_t pm_band_arfcn_stop; uint16_t band_arfcn; uint8_t tx_power; uint8_t bsic; @@ -66,13 +66,13 @@ int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta); -int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t arfcn); -int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t arfcn); +int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn); +int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn); int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type); int trx_if_cmd_measure(struct trx_instance *trx, - uint16_t arfcn_start, uint16_t arfcn_stop); + uint16_t band_arfcn_start, uint16_t band_arfcn_stop); int trx_if_tx_burst(struct trx_instance *trx, uint8_t tn, uint32_t fn, uint8_t pwr, const ubit_t *bits); -- To view, visit https://gerrit.osmocom.org/10778 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: I0b7634c80986dbff9d0da421c6a044cd36c9fd01 Gerrit-Change-Number: 10778 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:23:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:23:20 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: use proper format specifiers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10779 Change subject: trxcon/trx_if.c: use proper format specifiers ...................................................................... trxcon/trx_if.c: use proper format specifiers The '%u' format specifier should be used for unsigned values. Change-Id: I90200581036f8ab3969dd68664688f98cd2d3618 --- M src/host/trxcon/trx_if.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/10779/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index e08857c..89331f3 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -295,7 +295,7 @@ int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type) { - return trx_ctrl_cmd(trx, 1, "SETSLOT", "%d %d", tn, type); + return trx_ctrl_cmd(trx, 1, "SETSLOT", "%u %u", tn, type); } /* @@ -321,7 +321,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "RXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd(trx, 1, "RXTUNE", "%u", freq10 * 100); } int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn) @@ -335,7 +335,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "TXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd(trx, 1, "TXTUNE", "%u", freq10 * 100); } /* @@ -366,7 +366,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "MEASURE", "%d", freq10 * 100); + return trx_ctrl_cmd(trx, 1, "MEASURE", "%u", freq10 * 100); } static void trx_if_measure_rsp_cb(struct trx_instance *trx, char *resp) -- To view, visit https://gerrit.osmocom.org/10779 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: I90200581036f8ab3969dd68664688f98cd2d3618 Gerrit-Change-Number: 10779 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:23:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:23:21 +0000 Subject: Change in osmocom-bb[master]: Use uint8_t instead of int8_t for Timing Advance Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10780 Change subject: Use uint8_t instead of int8_t for Timing Advance ...................................................................... Use uint8_t instead of int8_t for Timing Advance According to the GSM specifications, Timing Advance value shall be in range [0..63]. For some reason, a signed int8_t type was used to store this value. Let's use an unsigned uint8_t in order to avoid possible confusion and to prevent possible mistakes of passing a negative value. Change-Id: Ib2ffd24bfb5abb7cc03b20a99628ef18dd365c15 --- M include/l1ctl_proto.h M src/host/trxcon/l1ctl.c M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h M src/host/virt_phy/src/l1ctl_sap.c M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/l23_api.c 7 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/10780/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 9d548bc..9992eae 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -241,7 +241,7 @@ /* the l1_info_ul header is in front */ struct l1ctl_par_req { - int8_t ta; + uint8_t ta; uint8_t tx_power; uint8_t padding[2]; } __attribute__((packed)); diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 49d6a12..0efd0be 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -659,7 +659,7 @@ par_req = (struct l1ctl_par_req *) ul->payload; LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_PARAM_REQ " - "(ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); + "(ta=%u, tx_power=%u)\n", par_req->ta, par_req->tx_power); rc |= trx_if_cmd_setta(l1l->trx, par_req->ta); diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 89331f3..6fa4996 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -409,19 +409,19 @@ * RSP SETTA */ -int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta) +int trx_if_cmd_setta(struct trx_instance *trx, uint8_t ta) { /* Do nothing, if requested TA value matches the current */ if (trx->ta == ta) return 0; /* Make sure that TA value is in valid range */ - if (ta < 0 || ta > 63) { - LOGP(DTRX, LOGL_ERROR, "TA value %d is out of allowed range\n", ta); + if (ta > 63) { + LOGP(DTRX, LOGL_ERROR, "TA value %u is out of allowed range\n", ta); return -ENOTSUP; } - return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); + return trx_ctrl_cmd(trx, 0, "SETTA", "%u", ta); } /* Get response from CTRL socket */ diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index ed6bd3f..9e2615f 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -34,7 +34,7 @@ uint8_t tx_power; uint8_t bsic; uint8_t tsc; - int8_t ta; + uint8_t ta; /* Scheduler stuff */ struct trx_sched sched; @@ -64,7 +64,7 @@ int trx_if_cmd_setpower(struct trx_instance *trx, int db); int trx_if_cmd_adjpower(struct trx_instance *trx, int db); -int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta); +int trx_if_cmd_setta(struct trx_instance *trx, uint8_t ta); int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn); int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn); diff --git a/src/host/virt_phy/src/l1ctl_sap.c b/src/host/virt_phy/src/l1ctl_sap.c index aac49bf..df4ad64 100644 --- a/src/host/virt_phy/src/l1ctl_sap.c +++ b/src/host/virt_phy/src/l1ctl_sap.c @@ -399,7 +399,7 @@ struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *)l1h->data; struct l1ctl_par_req *par_req = (struct l1ctl_par_req *)ul->payload; - LOGPMS(DL1C, LOGL_INFO, ms, "Rx L1CTL_PARAM_REQ (ta=%d, tx_power=%d)\n", + LOGPMS(DL1C, LOGL_INFO, ms, "Rx L1CTL_PARAM_REQ (ta=%u, tx_power=%d)\n", par_req->ta, par_req->tx_power); } diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h index dae85a1..ed305e9 100644 --- a/src/target/firmware/include/layer1/sync.h +++ b/src/target/firmware/include/layer1/sync.h @@ -75,7 +75,7 @@ int32_t tpu_offset_correction; /* TX parameters */ - int8_t ta; + uint8_t ta; uint8_t tx_power; /* TCH */ diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index e53b0c8..5bfece7 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -337,7 +337,7 @@ struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *) l1h->data; struct l1ctl_par_req *par_req = (struct l1ctl_par_req *) ul->payload; - printd("L1CTL_PARAM_REQ (ta=%d, tx_power=%d)\n", par_req->ta, + printd("L1CTL_PARAM_REQ (ta=%u, tx_power=%d)\n", par_req->ta, par_req->tx_power); l1s.ta = par_req->ta; -- To view, visit https://gerrit.osmocom.org/10780 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: Ib2ffd24bfb5abb7cc03b20a99628ef18dd365c15 Gerrit-Change-Number: 10780 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:23:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:23:21 +0000 Subject: Change in osmocom-bb[master]: firmware/l23_api.c: cosmetic: use proper format specifier Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10781 Change subject: firmware/l23_api.c: cosmetic: use proper format specifier ...................................................................... firmware/l23_api.c: cosmetic: use proper format specifier The '%u' format specifier should be used for unsigned values. Change-Id: I1108c34e864304126e581d30b75bbd95b93f60b8 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/10781/1 diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 5bfece7..5a5f7f9 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -337,7 +337,7 @@ struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *) l1h->data; struct l1ctl_par_req *par_req = (struct l1ctl_par_req *) ul->payload; - printd("L1CTL_PARAM_REQ (ta=%u, tx_power=%d)\n", par_req->ta, + printd("L1CTL_PARAM_REQ (ta=%u, tx_power=%u)\n", par_req->ta, par_req->tx_power); l1s.ta = par_req->ta; -- To view, visit https://gerrit.osmocom.org/10781 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: I1108c34e864304126e581d30b75bbd95b93f60b8 Gerrit-Change-Number: 10781 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:37:26 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Wed, 5 Sep 2018 19:37:26 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse Message-ID: Piotr Krysik has uploaded this change for review. ( https://gerrit.osmocom.org/10782 Change subject: grgsm_trx: Migrated argument parsing to argparse ...................................................................... grgsm_trx: Migrated argument parsing to argparse Argparse makes adding new parameters easier and adds consistent way of handling default values of parameters and printing of their help info. Change-Id: Idf99fd7a581464aa2f77fe01e721dbd162686811 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 280 insertions(+), 300 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/82/10782/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 45312e6..712b0b7 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -4,6 +4,7 @@ # GR-GSM based transceiver # # (C) 2016-2018 by Vadim Yanitskiy +# (C) 2017-2018 by Piotr Krysik # # All Rights Reserved # @@ -30,34 +31,40 @@ from grgsm.trx import ctrl_if_bb from grgsm.trx import radio_if from grgsm.trx import fake_pm +from argparse import ArgumentParser COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ - "Copyright (C) 2017 by Piotr Krysik \n" \ + "Copyright (C) 2017-2018 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" \ "There is NO WARRANTY, to the extent permitted by law.\n" -class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 6700 - - # PHY specific - phy_sample_rate = 4 * 1625000 / 6 - phy_freq_offset_hz = None - phy_tx_antenna = "TX/RX" - phy_rx_antenna = "RX2" - phy_rx_gain = 30 - phy_tx_gain = 10 - phy_args = "" - phy_ppm = 0 - - def __init__(self): - self.print_copyright() - self.parse_argv() +class grgsm_trx: + def __init__(self, + remote_addr, + bind_addr, + base_port, + args, + sample_rate, + rx_gain, + tx_gain, + rx_antenna, + tx_antenna, + freq_offset, + ppm): + self.remote_addr = remote_addr + self.bind_addr = bind_addr + self.base_port = base_port + self.phy_args = args + self.phy_sample_rate = sample_rate + self.phy_rx_gain = rx_gain + self.phy_tx_gain = tx_gain + self.phy_rx_antenna = rx_antenna + self.phy_tx_antenna = tx_antenna + self.phy_freq_offset = freq_offset + self.phy_ppm = ppm # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -66,14 +73,10 @@ # Init Radio interface 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.phy_rx_antenna, self.phy_tx_antenna, self.phy_freq_offset, self.bind_addr, self.remote_addr, self.base_port) - # Optional frequency offset - if self.phy_freq_offset_hz is not None: - self.radio.freq_offset_hz = self.phy_freq_offset_hz - # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 @@ -95,97 +98,73 @@ print("[i] Shutting down...") self.radio.shutdown() - def print_copyright(self): - print(COPYRIGHT) - - def print_help(self): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - # 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 - 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 %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" \ - " --freq-offset Shift baseband freq. (e.g. -500M)\n" \ - " --ppm Set frequency correction (default %d)\n" - - print(s % ( - self.remote_addr, - self.bind_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: - opts, args = getopt.getopt(sys.argv[1:], - "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=", "freq-offset="]) - except getopt.GetoptError as err: - # Print(help and exit) - self.print_help() - print("[!] " + str(err)) - sys.exit(2) - - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) - - # 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) - else: - print("[!] The port number should be in range [0-65536]") - sys.exit(2) - - # PHY specific - elif o in ("-a", "--device-args"): - self.phy_args = v - elif o in ("-s", "--sample-rate"): - self.phy_sample_rate = int(v) - elif o in ("-g", "--rx-gain"): - self.phy_rx_gain = int(v) - elif o in ("-G", "--tx-gain"): - self.phy_tx_gain = int(v) - elif o in ("--rx-antenna"): - self.phy_rx_antenna = v - elif o in ("--tx-antenna"): - self.phy_tx_antenna = v - elif o in ("--ppm"): - self.phy_ppm = int(v) - elif o in ("--freq-offset"): - # Convert /\d+(\.\d+)?(M|k)?/ to Hz - offset_hz = eng_notation.str_to_num(v) - self.phy_freq_offset_hz = offset_hz - def sig_handler(self, signum, frame): print("Signal %d received" % signum) if signum is signal.SIGINT: self.shutdown() sys.exit(0) -if __name__ == '__main__': - app = Application() +def parse_args(): + description = 'Burst transceiver for GSM Mobile Station' + parser = ArgumentParser(prog="grgsm_trx", usage='%(prog)s [options]', + description=description) + # TRX specific + parser.add_argument("-i", "--remote-addr", dest="remote_addr", type=str, + default='127.0.0.1', + help="Set remote address default=%(default)s") + parser.add_argument("-b", "--bind-addr", dest="bind_addr", type=str, + default='0.0.0.0', + help="Set bind address default=%(default)s") + parser.add_argument( + "-p", "--base_port", dest="base_port", type=int, + default=6700, + help="Set base port number default=%(default)s") + + # PHY specific + parser.add_argument("-a", "--args", dest="args", type=str, + default="", + help="Set Device Arguments default=%(default)s") + parser.add_argument("-s", "--sample-rate", dest="sample_rate", type=float, + default=1083333.3333333333, + help="Set samp_rate default=%(default)s") + parser.add_argument("-g", "--rx-gain", dest="rx_gain", type=float, + default=30, + help="Set RX gain default=%(default)s") + parser.add_argument("-G", "--tx-gain", dest="tx_gain", type=float, + default=10, + help="Set TX gain default=%(default)s") + parser.add_argument("--rx-antenna", dest="rx_antenna", type=str, + default="RX2", + help="Set RX antenna") + parser.add_argument("--tx-antenna", dest="tx_antenna", type=str, + default='TX/RX', + help="Set TX antenna default=%(default)s") + parser.add_argument( + "--freq-offset", dest="freq_offset", type=float, + default=0, + help="Shift Tx and Rx frequencies default=%(default)s") + parser.add_argument("--ppm", dest="ppm", type=float, + default=0, + help="Set ppm default=%(default)s") + + return parser.parse_args() + +def main(): + print(COPYRIGHT) + options = parse_args() + app = grgsm_trx( + remote_addr=options.remote_addr, + bind_addr=options.bind_addr, + base_port=options.base_port, + args=options.args, + sample_rate=options.sample_rate, + rx_gain=options.rx_gain, + tx_gain=options.tx_gain, + rx_antenna=options.rx_antenna, + tx_antenna=options.tx_antenna, + freq_offset=options.freq_offset, + ppm=options.ppm) app.run() + +if __name__ == '__main__': + main() diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 407e724..17a0d00 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -59,251 +59,252 @@ self.message_port_pub(pmt.intern("dict_out"), pmt.to_pmt(d)) class radio_if(gr.top_block): - # PHY specific variables - freq_offset_hz = None - rx_freq = 935e6 - tx_freq = 890e6 - osr = 4 + # PHY specific variables + rx_freq = 935e6 + tx_freq = 890e6 + osr = 4 - # Application state flags - trx_started = False + # Application state flags + trx_started = False - # GSM timings (in microseconds [uS]) - # One timeslot duration is 576.9 ?s = 15/26 ms, - # or 156.25 symbol periods (a symbol period is 48/13 ?s) - GSM_SYM_PERIOD_uS = 48.0 / 13.0 - GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 - GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) + # GSM timings (in microseconds [uS]) + # One timeslot duration is 576.9 ?s = 15/26 ms, + # or 156.25 symbol periods (a symbol period is 48/13 ?s) + GSM_SYM_PERIOD_uS = 48.0 / 13.0 + GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 + GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) - # FIXME: shall be measured (automatically?) for - # particular device and particular clock rate. - # The current value is measured for USRP B2X0 at 26e6. - delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6 + # FIXME: shall be measured (automatically?) for + # particular device and particular clock rate. + # The current value is measured for USRP B2X0 at 26e6. + delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6 - def __init__(self, phy_args, phy_sample_rate, - phy_rx_gain, phy_tx_gain, phy_ppm, - phy_rx_antenna, phy_tx_antenna, - trx_bind_addr, trx_remote_addr, - trx_base_port): + def __init__(self, phy_args, phy_sample_rate, + phy_rx_gain, phy_tx_gain, phy_ppm, + phy_rx_antenna, phy_tx_antenna, + phy_freq_offset, + trx_bind_addr, trx_remote_addr, + trx_base_port): - 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)) + 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 - self.rx_gain = phy_rx_gain - self.tx_gain = phy_tx_gain - self.ppm = phy_ppm + # PHY specific variables + self.sample_rate = phy_sample_rate + self.rx_gain = phy_rx_gain + self.tx_gain = phy_tx_gain + self.phy_freq_offset = phy_freq_offset + self.ppm = phy_ppm - gr.top_block.__init__(self, "GR-GSM TRX") + gr.top_block.__init__(self, "GR-GSM TRX") - # TRX Burst Interface - self.trx_burst_if = grgsm.trx_burst_if( - trx_bind_addr, trx_remote_addr, - str(trx_base_port)) + # TRX Burst Interface + self.trx_burst_if = grgsm.trx_burst_if( + trx_bind_addr, trx_remote_addr, + str(trx_base_port)) - # RX path definition - self.phy_src = uhd.usrp_source(phy_args, - uhd.stream_args(cpu_format="fc32", - channels=range(1))) + # RX path definition + self.phy_src = uhd.usrp_source(phy_args, + uhd.stream_args(cpu_format="fc32", + channels=range(1))) - self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_src.set_center_freq(self.rx_freq, 0) - self.phy_src.set_antenna(phy_rx_antenna, 0) - self.phy_src.set_samp_rate(phy_sample_rate) - self.phy_src.set_bandwidth(650e3, 0) - self.phy_src.set_gain(phy_rx_gain) + self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) + self.phy_src.set_center_freq(self.rx_freq, 0) + self.phy_src.set_antenna(phy_rx_antenna, 0) + self.phy_src.set_samp_rate(phy_sample_rate) + self.phy_src.set_bandwidth(650e3, 0) + self.phy_src.set_gain(phy_rx_gain) - self.msg_to_tag_src = grgsm.msg_to_tag() + self.msg_to_tag_src = grgsm.msg_to_tag() - self.rotator_src = grgsm.controlled_rotator_cc( - self.calc_phase_inc(self.rx_freq)) + self.rotator_src = grgsm.controlled_rotator_cc( + self.calc_phase_inc(self.rx_freq)) - self.lpf = filter.fir_filter_ccf(1, firdes.low_pass( - 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) + self.lpf = filter.fir_filter_ccf(1, firdes.low_pass( + 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) - self.gsm_receiver = grgsm.receiver(self.osr, ([0]), ([])) + self.gsm_receiver = grgsm.receiver(self.osr, ([0]), ([])) - self.ts_filter = grgsm.burst_timeslot_filter(0) - self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) + self.ts_filter = grgsm.burst_timeslot_filter(0) + self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) - # Connections - self.connect( - (self.phy_src, 0), - (self.msg_to_tag_src, 0)) + # Connections + self.connect( + (self.phy_src, 0), + (self.msg_to_tag_src, 0)) - self.connect( - (self.msg_to_tag_src, 0), - (self.rotator_src, 0)) + self.connect( + (self.msg_to_tag_src, 0), + (self.rotator_src, 0)) - self.connect( - (self.rotator_src, 0), - (self.lpf, 0)) + self.connect( + (self.rotator_src, 0), + (self.lpf, 0)) - self.connect( - (self.lpf, 0), - (self.gsm_receiver, 0)) + self.connect( + (self.lpf, 0), + (self.gsm_receiver, 0)) - self.msg_connect( - (self.gsm_receiver, 'C0'), - (self.ts_filter, 'in')) + self.msg_connect( + (self.gsm_receiver, 'C0'), + (self.ts_filter, 'in')) - self.msg_connect( - (self.ts_filter, 'out'), - (self.trx_burst_if, 'bursts')) + self.msg_connect( + (self.ts_filter, 'out'), + (self.trx_burst_if, 'bursts')) - # TX Path Definition - self.phy_sink = uhd.usrp_sink(phy_args, - uhd.stream_args(cpu_format="fc32", - channels=range(1)), "packet_len") + # TX Path Definition + self.phy_sink = uhd.usrp_sink(phy_args, + uhd.stream_args(cpu_format="fc32", + channels=range(1)), "packet_len") - self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_sink.set_antenna(phy_tx_antenna, 0) - self.phy_sink.set_samp_rate(phy_sample_rate) - self.phy_sink.set_center_freq(self.tx_freq, 0) - self.phy_sink.set_gain(self.tx_gain) + self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) + self.phy_sink.set_antenna(phy_tx_antenna, 0) + self.phy_sink.set_samp_rate(phy_sample_rate) + self.phy_sink.set_center_freq(self.tx_freq, 0) + self.phy_sink.set_gain(self.tx_gain) - self.tx_time_setter = grgsm.txtime_setter( - 0xffffffff, 0, 0, 0, 0, 0, - self.delay_correction + self.GSM_UL_DL_SHIFT_uS * 1e-6) + self.tx_time_setter = grgsm.txtime_setter( + 0xffffffff, 0, 0, 0, 0, 0, + self.delay_correction + self.GSM_UL_DL_SHIFT_uS * 1e-6) - self.tx_burst_proc = grgsm.preprocess_tx_burst() + self.tx_burst_proc = grgsm.preprocess_tx_burst() - self.pdu_to_tagged_stream = blocks.pdu_to_tagged_stream( - blocks.byte_t, 'packet_len') + self.pdu_to_tagged_stream = blocks.pdu_to_tagged_stream( + blocks.byte_t, 'packet_len') - self.gmsk_mod = grgsm.gsm_gmsk_mod( - BT = 0.3, pulse_duration = 4, sps = self.osr) + self.gmsk_mod = grgsm.gsm_gmsk_mod( + BT = 0.3, pulse_duration = 4, sps = self.osr) - self.burst_shaper = digital.burst_shaper_cc( - (firdes.window(firdes.WIN_HANN, 16, 0)), - 0, 20, False, "packet_len") + self.burst_shaper = digital.burst_shaper_cc( + (firdes.window(firdes.WIN_HANN, 16, 0)), + 0, 20, False, "packet_len") - self.msg_to_tag_sink = grgsm.msg_to_tag() + self.msg_to_tag_sink = grgsm.msg_to_tag() - self.rotator_sink = grgsm.controlled_rotator_cc( - -self.calc_phase_inc(self.tx_freq)) + self.rotator_sink = grgsm.controlled_rotator_cc( + -self.calc_phase_inc(self.tx_freq)) - # Connections - self.msg_connect( - (self.trx_burst_if, 'bursts'), - (self.tx_time_setter, 'bursts_in')) + # Connections + self.msg_connect( + (self.trx_burst_if, 'bursts'), + (self.tx_time_setter, 'bursts_in')) - self.msg_connect( - (self.tx_time_setter, 'bursts_out'), - (self.tx_burst_proc, 'bursts_in')) + self.msg_connect( + (self.tx_time_setter, 'bursts_out'), + (self.tx_burst_proc, 'bursts_in')) - self.msg_connect( - (self.tx_burst_proc, 'bursts_out'), - (self.pdu_to_tagged_stream, 'pdus')) + self.msg_connect( + (self.tx_burst_proc, 'bursts_out'), + (self.pdu_to_tagged_stream, 'pdus')) - self.connect( - (self.pdu_to_tagged_stream, 0), - (self.gmsk_mod, 0)) + self.connect( + (self.pdu_to_tagged_stream, 0), + (self.gmsk_mod, 0)) - self.connect( - (self.gmsk_mod, 0), - (self.burst_shaper, 0)) + self.connect( + (self.gmsk_mod, 0), + (self.burst_shaper, 0)) - self.connect( - (self.burst_shaper, 0), - (self.msg_to_tag_sink, 0)) + self.connect( + (self.burst_shaper, 0), + (self.msg_to_tag_sink, 0)) - self.connect( - (self.msg_to_tag_sink, 0), - (self.rotator_sink, 0)) + self.connect( + (self.msg_to_tag_sink, 0), + (self.rotator_sink, 0)) - self.connect( - (self.rotator_sink, 0), - (self.phy_sink, 0)) + self.connect( + (self.rotator_sink, 0), + (self.phy_sink, 0)) - # RX & TX synchronization - self.bt_filter = grgsm.burst_type_filter([3]) - self.burst_to_fn_time = grgsm.burst_to_fn_time() + # RX & TX synchronization + self.bt_filter = grgsm.burst_type_filter([3]) + self.burst_to_fn_time = grgsm.burst_to_fn_time() - # Connections - self.msg_connect( - (self.gsm_receiver, 'C0'), - (self.bt_filter, 'bursts_in')) + # Connections + self.msg_connect( + (self.gsm_receiver, 'C0'), + (self.bt_filter, 'bursts_in')) - self.msg_connect( - (self.bt_filter, 'bursts_out'), - (self.burst_to_fn_time, 'bursts_in')) + self.msg_connect( + (self.bt_filter, 'bursts_out'), + (self.burst_to_fn_time, 'bursts_in')) - self.msg_connect( - (self.burst_to_fn_time, 'fn_time_out'), - (self.tx_time_setter, 'fn_time')) + self.msg_connect( + (self.burst_to_fn_time, 'fn_time_out'), + (self.tx_time_setter, 'fn_time')) - # AFC (Automatic Frequency Correction) - self.gsm_clck_ctrl = grgsm.clock_offset_control( - self.rx_freq, phy_sample_rate, osr = self.osr) + # AFC (Automatic Frequency Correction) + self.gsm_clck_ctrl = grgsm.clock_offset_control( + self.rx_freq, phy_sample_rate, osr = self.osr) - self.dict_toggle_sign = dict_toggle_sign() + self.dict_toggle_sign = dict_toggle_sign() - # Connections - self.msg_connect( - (self.gsm_receiver, 'measurements'), - (self.gsm_clck_ctrl, 'measurements')) + # Connections + self.msg_connect( + (self.gsm_receiver, 'measurements'), + (self.gsm_clck_ctrl, 'measurements')) - self.msg_connect( - (self.gsm_clck_ctrl, 'ctrl'), - (self.msg_to_tag_src, 'msg')) + self.msg_connect( + (self.gsm_clck_ctrl, 'ctrl'), + (self.msg_to_tag_src, 'msg')) - self.msg_connect( - (self.gsm_clck_ctrl, 'ctrl'), - (self.dict_toggle_sign, 'dict_in')) + self.msg_connect( + (self.gsm_clck_ctrl, 'ctrl'), + (self.dict_toggle_sign, 'dict_in')) - self.msg_connect( - (self.dict_toggle_sign, 'dict_out'), - (self.msg_to_tag_sink, 'msg')) + self.msg_connect( + (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)) + # 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() - self.wait() + def shutdown(self): + print("[i] Shutdown Radio interface") + self.stop() + self.wait() - def calc_phase_inc(self, fc): - return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate + def calc_phase_inc(self, fc): + return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate - def set_rx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting RX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) - self.phy_src.set_center_freq(fc, 0) - self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) - self.rx_freq = fc + def set_rx_freq(self, fc): + if self.phy_freq_offset != 0: + fc += self.phy_freq_offset + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset))) + self.phy_src.set_center_freq(fc, 0) + self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) + self.rx_freq = fc - def set_tx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting TX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) - self.phy_sink.set_center_freq(fc, 0) - self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) - self.tx_freq = fc + def set_tx_freq(self, fc): + if self.phy_freq_offset != 0: + fc += self.phy_freq_offset + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset))) + self.phy_sink.set_center_freq(fc, 0) + self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) + self.tx_freq = fc - def set_rx_gain(self, gain): - self.phy_src.set_gain(gain, 0) - self.rx_gain = gain + def set_rx_gain(self, gain): + self.phy_src.set_gain(gain, 0) + self.rx_gain = gain - def set_tx_gain(self, gain): - self.phy_sink.set_gain(gain, 0) - self.tx_gain = gain + def set_tx_gain(self, gain): + self.phy_sink.set_gain(gain, 0) + self.tx_gain = gain - def set_ta(self, ta): - print("[i] Setting TA value %d" % ta) - advance_time_sec = ta * self.GSM_SYM_PERIOD_uS * 1e-6 - self.tx_time_setter.set_timing_advance(advance_time_sec) + def set_ta(self, ta): + print("[i] Setting TA value %d" % ta) + advance_time_sec = ta * self.GSM_SYM_PERIOD_uS * 1e-6 + self.tx_time_setter.set_timing_advance(advance_time_sec) -- To view, visit https://gerrit.osmocom.org/10782 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: Idf99fd7a581464aa2f77fe01e721dbd162686811 Gerrit-Change-Number: 10782 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 19:48:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Sep 2018 19:48:10 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10783 Change subject: trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ ...................................................................... trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ A BSC may allocate a dedicated channel on any ARFCN, not necessary on the same one where a mobile station has requested this channel. For some reason, the ARFCN info of L1CTL_DM_EST_REQ message was not handled by trxcon. Let's fix this. Related: OS#3526 Change-Id: I16ed5c64236c159bfa39002b05094c1f6c171f6b --- M src/host/trxcon/l1ctl.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/10783/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 0efd0be..09d90a1 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -554,6 +554,16 @@ goto exit; } + /* Only if the current ARFCN differs */ + if (l1l->trx->band_arfcn != band_arfcn) { + /* Update current ARFCN */ + l1l->trx->band_arfcn = band_arfcn; + + /* Tune transceiver to required ARFCN */ + trx_if_cmd_rxtune(l1l->trx, band_arfcn); + trx_if_cmd_txtune(l1l->trx, band_arfcn); + } + /* Update TSC (Training Sequence Code) */ l1l->trx->tsc = est_req->tsc; -- To view, visit https://gerrit.osmocom.org/10783 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: I16ed5c64236c159bfa39002b05094c1f6c171f6b Gerrit-Change-Number: 10783 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 20:33:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Wed, 5 Sep 2018 20:33:40 +0000 Subject: Change in gr-gsm[master]: grgsm_scanner: Add --debug option Message-ID: Vasil Velichkov has uploaded this change for review. ( https://gerrit.osmocom.org/10784 Change subject: grgsm_scanner: Add --debug option ...................................................................... grgsm_scanner: Add --debug option When set the stdout and stderr won't be redirected to /dev/null which will facilitate resolving issues Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 --- M apps/grgsm_scanner 1 file changed, 21 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/84/10784/1 diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner index b57569d..32210ed 100755 --- a/apps/grgsm_scanner +++ b/apps/grgsm_scanner @@ -297,7 +297,7 @@ return "ARFCN: %4u, Freq: %6.1fM, CID: %5u, LAC: %5u, MCC: %3u, MNC: %3u, Pwr: %3i" % ( self.arfcn, self.freq / 1e6, self.cid, self.lac, self.mcc, self.mnc, self.power) -def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None): +def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug = False): signallist = [] channels_num = int(samp_rate / 0.2e6) for arfcn_range in grgsm.arfcn.get_arfcn_ranges(band): @@ -311,14 +311,15 @@ while current_freq < stop_freq: - # silence rtl_sdr output: - # open 2 fds - null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)] - # save the current file descriptors to a tuple - save = os.dup(1), os.dup(2) - # put /dev/null fds on 1 and 2 - os.dup2(null_fds[0], 1) - os.dup2(null_fds[1], 2) + if not debug: + # silence rtl_sdr output: + # open 2 fds + null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)] + # save the current file descriptors to a tuple + save = os.dup(1), os.dup(2) + # put /dev/null fds on 1 and 2 + os.dup2(null_fds[0], 1) + os.dup2(null_fds[1], 2) # instantiate scanner and processor scanner = wideband_scanner(rec_len=6 - speed, @@ -359,12 +360,14 @@ scanner = None - # restore file descriptors so we can print the results - os.dup2(save[0], 1) - os.dup2(save[1], 2) - # close the temporary fds - os.close(null_fds[0]) - os.close(null_fds[1]) + + if not debug: + # restore file descriptors so we can print the results + os.dup2(save[0], 1) + os.dup2(save[1], 2) + # close the temporary fds + os.close(null_fds[0]) + os.close(null_fds[1]) if prn: prn(found_list) signallist.extend(found_list) @@ -389,6 +392,8 @@ help="Scan speed [default=%default]. Value range 0-5.") parser.add_option("-v", "--verbose", action="store_true", help="If set, verbose information output is printed: ccch configuration, cell ARFCN's, neighbour ARFCN's") + parser.add_option("-d", "--debug", action="store_true", + help="Print additional debug messages") """ Dont forget: sudo sysctl kernel.shmmni=32000 @@ -415,7 +420,7 @@ print info.get_verbose_info() print "" do_scan(options.samp_rate, options.band, options.speed, - options.ppm, options.gain, options.args, prn = printfunc) + options.ppm, options.gain, options.args, prn = printfunc, debug = options.debug) if __name__ == '__main__': main() -- To view, visit https://gerrit.osmocom.org/10784 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: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 Gerrit-Change-Number: 10784 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 5 21:11:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 21:11:21 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: drop meaningless 'tn > 7' checks In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10776 ) Change subject: trxcon/l1ctl.c: drop meaningless 'tn > 7' checks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10776 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: Ib84417099d303bd3ae3557f48a5c40b812c6cdfc Gerrit-Change-Number: 10776 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Sep 2018 21:11: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 Sep 5 21:11:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 21:11:47 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10777 ) Change subject: trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10777 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: If092743c32b7a6f5da7c8339b0f7b92ccf8a7a8b Gerrit-Change-Number: 10777 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Sep 2018 21:11: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 Sep 5 21:12:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 21:12:24 +0000 Subject: Change in osmocom-bb[master]: trxcon: avoid arfcn / band_arfcn naming confusion In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10778 ) Change subject: trxcon: avoid arfcn / band_arfcn naming confusion ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10778 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: I0b7634c80986dbff9d0da421c6a044cd36c9fd01 Gerrit-Change-Number: 10778 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Sep 2018 21:12: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 Sep 5 21:12:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 21:12:58 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: use proper format specifiers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10779 ) Change subject: trxcon/trx_if.c: use proper format specifiers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10779 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: I90200581036f8ab3969dd68664688f98cd2d3618 Gerrit-Change-Number: 10779 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Sep 2018 21:12: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 Sep 5 21:14:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Sep 2018 21:14:25 +0000 Subject: Change in osmocom-bb[master]: Use uint8_t instead of int8_t for Timing Advance In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10780 ) Change subject: Use uint8_t instead of int8_t for Timing Advance ...................................................................... Patch Set 1: Code-Review-1 I think the signed is intentional so you can spoof wrong locations -- To view, visit https://gerrit.osmocom.org/10780 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: Ib2ffd24bfb5abb7cc03b20a99628ef18dd365c15 Gerrit-Change-Number: 10780 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Sep 2018 21:14:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 09:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 09:33:01 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: drop meaningless 'tn > 7' checks In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10776 ) Change subject: trxcon/l1ctl.c: drop meaningless 'tn > 7' checks ...................................................................... trxcon/l1ctl.c: drop meaningless 'tn > 7' checks There is no need to check the range of timeslot number, which is decoded from GSM 08.58 channel number (9.3.1) by applying 0x07 mask, because any result of this operation is always within the correct range. Change-Id: Ib84417099d303bd3ae3557f48a5c40b812c6cdfc --- M src/host/trxcon/l1ctl.c 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 74400be..ec8b4c7 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -565,11 +565,6 @@ /* Determine TS index */ tn = chan_nr & 0x7; - if (tn > 7) { - LOGP(DL1C, LOGL_ERROR, "Incorrect TS index %u\n", tn); - rc = -EINVAL; - goto exit; - } /* Configure requested TS */ rc = sched_trx_configure_ts(l1l->trx, tn, config); @@ -732,11 +727,6 @@ /* Determine TS index */ tn = ul->chan_nr & 0x7; - if (tn > 7) { - LOGP(DL1C, LOGL_ERROR, "Incorrect TS index %u\n", tn); - rc = -EINVAL; - goto exit; - } /* Make sure that required TS is allocated and configured */ ts = l1l->trx->ts_list[tn]; -- To view, visit https://gerrit.osmocom.org/10776 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: Ib84417099d303bd3ae3557f48a5c40b812c6cdfc Gerrit-Change-Number: 10776 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 09:33:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 09:33:02 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10777 ) Change subject: trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ ...................................................................... trxcon/l1ctl.c: print timeslot number from L1CTL_DM_EST_REQ Change-Id: If092743c32b7a6f5da7c8339b0f7b92ccf8a7a8b --- M src/host/trxcon/l1ctl.c 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index ec8b4c7..9d6871e 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -541,10 +541,12 @@ band_arfcn = ntohs(est_req->h0.band_arfcn); chan_nr = ul->chan_nr; + tn = chan_nr & 0x07; LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ (arfcn=%u, " - "chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", (band_arfcn &~ ARFCN_FLAG_MASK), - chan_nr, est_req->tsc, est_req->tch_mode); + "tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", + (band_arfcn &~ ARFCN_FLAG_MASK), tn, chan_nr, + est_req->tsc, est_req->tch_mode); if (est_req->h) { LOGP(DL1C, LOGL_ERROR, "FHSS is not supported\n"); @@ -563,9 +565,6 @@ goto exit; } - /* Determine TS index */ - tn = chan_nr & 0x7; - /* Configure requested TS */ rc = sched_trx_configure_ts(l1l->trx, tn, config); ts = l1l->trx->ts_list[tn]; -- To view, visit https://gerrit.osmocom.org/10777 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: If092743c32b7a6f5da7c8339b0f7b92ccf8a7a8b Gerrit-Change-Number: 10777 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 09:33:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 09:33:03 +0000 Subject: Change in osmocom-bb[master]: trxcon: avoid arfcn / band_arfcn naming confusion In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10778 ) Change subject: trxcon: avoid arfcn / band_arfcn naming confusion ...................................................................... trxcon: avoid arfcn / band_arfcn naming confusion In the most cases an ARFCN value is stored together with some flags (e.g. DL/UL flag, DCS flag), so it should be taken into account e.g. when printing. Let's use the proper naming. Change-Id: I0b7634c80986dbff9d0da421c6a044cd36c9fd01 --- M src/host/trxcon/l1ctl.c M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h 3 files changed, 32 insertions(+), 32 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 9d6871e..49d6a12 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -349,7 +349,7 @@ static int l1ctl_rx_pm_req(struct l1ctl_link *l1l, struct msgb *msg) { - uint16_t arfcn_start, arfcn_stop; + uint16_t band_arfcn_start, band_arfcn_stop; struct l1ctl_pm_req *pmr; int rc = 0; @@ -361,17 +361,17 @@ goto exit; } - arfcn_start = ntohs(pmr->range.band_arfcn_from); - arfcn_stop = ntohs(pmr->range.band_arfcn_to); + band_arfcn_start = ntohs(pmr->range.band_arfcn_from); + band_arfcn_stop = ntohs(pmr->range.band_arfcn_to); LOGP(DL1C, LOGL_NOTICE, "Received power measurement " "request (%s: %d -> %d)\n", - gsm_band_name(gsm_arfcn2band(arfcn_start)), - arfcn_start &~ ARFCN_FLAG_MASK, - arfcn_stop &~ ARFCN_FLAG_MASK); + gsm_band_name(gsm_arfcn2band(band_arfcn_start)), + band_arfcn_start &~ ARFCN_FLAG_MASK, + band_arfcn_stop &~ ARFCN_FLAG_MASK); /* Send measurement request to transceiver */ - rc = trx_if_cmd_measure(l1l->trx, arfcn_start, arfcn_stop); + rc = trx_if_cmd_measure(l1l->trx, band_arfcn_start, band_arfcn_stop); exit: msgb_free(msg); diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index cab5a9b..e08857c 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -310,28 +310,28 @@ * RSP (RX/TX)TUNE */ -int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t arfcn) +int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn) { uint16_t freq10; /* RX is downlink on MS side */ - freq10 = gsm_arfcn2freq10(arfcn, 0); + freq10 = gsm_arfcn2freq10(band_arfcn, 0); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn); + LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); return -ENOTSUP; } return trx_ctrl_cmd(trx, 1, "RXTUNE", "%d", freq10 * 100); } -int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t arfcn) +int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn) { uint16_t freq10; /* TX is uplink on MS side */ - freq10 = gsm_arfcn2freq10(arfcn, 1); + freq10 = gsm_arfcn2freq10(band_arfcn, 1); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn); + LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); return -ENOTSUP; } @@ -351,18 +351,18 @@ */ int trx_if_cmd_measure(struct trx_instance *trx, - uint16_t arfcn_start, uint16_t arfcn_stop) + uint16_t band_arfcn_start, uint16_t band_arfcn_stop) { uint16_t freq10; /* Update ARFCN range for measurement */ - trx->pm_arfcn_start = arfcn_start; - trx->pm_arfcn_stop = arfcn_stop; + trx->pm_band_arfcn_start = band_arfcn_start; + trx->pm_band_arfcn_stop = band_arfcn_stop; /* Calculate a frequency for current ARFCN (DL) */ - freq10 = gsm_arfcn2freq10(arfcn_start, 0); + freq10 = gsm_arfcn2freq10(band_arfcn_start, 0); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn_start); + LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn_start); return -ENOTSUP; } @@ -372,7 +372,7 @@ static void trx_if_measure_rsp_cb(struct trx_instance *trx, char *resp) { unsigned int freq10; - uint16_t arfcn; + uint16_t band_arfcn; int dbm; /* Parse freq. and power level */ @@ -380,22 +380,22 @@ freq10 /= 100; /* Check received ARFCN against expected */ - arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); - if (arfcn != trx->pm_arfcn_start) { + band_arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); + if (band_arfcn != trx->pm_band_arfcn_start) { LOGP(DTRX, LOGL_ERROR, "Power measurement error: " "response ARFCN=%u doesn't match expected ARFCN=%u\n", - arfcn &~ ARFCN_FLAG_MASK, - trx->pm_arfcn_start &~ ARFCN_FLAG_MASK); + band_arfcn &~ ARFCN_FLAG_MASK, + trx->pm_band_arfcn_start &~ ARFCN_FLAG_MASK); return; } /* Send L1CTL_PM_CONF */ - l1ctl_tx_pm_conf(trx->l1l, arfcn, dbm, - arfcn == trx->pm_arfcn_stop); + l1ctl_tx_pm_conf(trx->l1l, band_arfcn, dbm, + band_arfcn == trx->pm_band_arfcn_stop); /* Schedule a next measurement */ - if (arfcn != trx->pm_arfcn_stop) - trx_if_cmd_measure(trx, ++arfcn, trx->pm_arfcn_stop); + if (band_arfcn != trx->pm_band_arfcn_stop) + trx_if_cmd_measure(trx, ++band_arfcn, trx->pm_band_arfcn_stop); } /* diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index 6080dce..ed6bd3f 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -28,8 +28,8 @@ uint32_t prev_state; /* GSM L1 specific */ - uint16_t pm_arfcn_start; - uint16_t pm_arfcn_stop; + uint16_t pm_band_arfcn_start; + uint16_t pm_band_arfcn_stop; uint16_t band_arfcn; uint8_t tx_power; uint8_t bsic; @@ -66,13 +66,13 @@ int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta); -int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t arfcn); -int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t arfcn); +int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn); +int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn); int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type); int trx_if_cmd_measure(struct trx_instance *trx, - uint16_t arfcn_start, uint16_t arfcn_stop); + uint16_t band_arfcn_start, uint16_t band_arfcn_stop); int trx_if_tx_burst(struct trx_instance *trx, uint8_t tn, uint32_t fn, uint8_t pwr, const ubit_t *bits); -- To view, visit https://gerrit.osmocom.org/10778 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: I0b7634c80986dbff9d0da421c6a044cd36c9fd01 Gerrit-Change-Number: 10778 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 09:33:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 09:33:03 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: use proper format specifiers In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10779 ) Change subject: trxcon/trx_if.c: use proper format specifiers ...................................................................... trxcon/trx_if.c: use proper format specifiers The '%u' format specifier should be used for unsigned values. Change-Id: I90200581036f8ab3969dd68664688f98cd2d3618 --- M src/host/trxcon/trx_if.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index e08857c..89331f3 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -295,7 +295,7 @@ int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type) { - return trx_ctrl_cmd(trx, 1, "SETSLOT", "%d %d", tn, type); + return trx_ctrl_cmd(trx, 1, "SETSLOT", "%u %u", tn, type); } /* @@ -321,7 +321,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "RXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd(trx, 1, "RXTUNE", "%u", freq10 * 100); } int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn) @@ -335,7 +335,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "TXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd(trx, 1, "TXTUNE", "%u", freq10 * 100); } /* @@ -366,7 +366,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(trx, 1, "MEASURE", "%d", freq10 * 100); + return trx_ctrl_cmd(trx, 1, "MEASURE", "%u", freq10 * 100); } static void trx_if_measure_rsp_cb(struct trx_instance *trx, char *resp) -- To view, visit https://gerrit.osmocom.org/10779 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: I90200581036f8ab3969dd68664688f98cd2d3618 Gerrit-Change-Number: 10779 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 10:39:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 10:39:56 +0000 Subject: Change in osmo-bts[master]: Move systemd service to contrib/systemd Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10796 Change subject: Move systemd service to contrib/systemd ...................................................................... Move systemd service to contrib/systemd Move it there and have only a symlink in debian/, like we do in all other projects. Change-Id: I213d3816a66e88069c31f85b3fbf462d1222aa43 --- R contrib/systemd/osmo-bts-trx.service R contrib/systemd/osmo-bts-virtual.service A debian/osmo-bts-trx.service A debian/osmo-bts-virtual.service 4 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/10796/1 diff --git a/debian/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service similarity index 100% rename from debian/osmo-bts-trx.service rename to contrib/systemd/osmo-bts-trx.service diff --git a/debian/osmo-bts-virtual.service b/contrib/systemd/osmo-bts-virtual.service similarity index 100% rename from debian/osmo-bts-virtual.service rename to contrib/systemd/osmo-bts-virtual.service diff --git a/debian/osmo-bts-trx.service b/debian/osmo-bts-trx.service new file mode 120000 index 0000000..1abb0ce --- /dev/null +++ b/debian/osmo-bts-trx.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-bts-trx.service \ No newline at end of file diff --git a/debian/osmo-bts-virtual.service b/debian/osmo-bts-virtual.service new file mode 120000 index 0000000..9a660b4 --- /dev/null +++ b/debian/osmo-bts-virtual.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-bts-virtual.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10796 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: I213d3816a66e88069c31f85b3fbf462d1222aa43 Gerrit-Change-Number: 10796 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 Sep 6 11:10:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 11:10:04 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10782 ) Change subject: grgsm_trx: Migrated argument parsing to argparse ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10782/1/python/trx/radio_if.py File python/trx/radio_if.py: https://gerrit.osmocom.org/#/c/10782/1/python/trx/radio_if.py at 62 PS1, Line 62: # PHY specific variables Sorry, but this change is not about migrating from tabs to spaces... Moreover, I don't see any reason to do this... -- To view, visit https://gerrit.osmocom.org/10782 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: Idf99fd7a581464aa2f77fe01e721dbd162686811 Gerrit-Change-Number: 10782 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 11:10:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 11:34:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 11:34:24 +0000 Subject: Change in osmo-bsc[master]: assignment: remove unnecessary call to gsm0808_speech_codec_from_chan... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10774 ) Change subject: assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10774/1/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/10774/1/src/osmo-bsc/assignment_fsm.c at 171 PS1, Line 171: /* FIXME: AMR codec configuration must be derived from lchan1! */ Thanks for spotting this! The below call was actually without effect, because it did not assign sc_ptr. But we also have chosen a speech codec for SCCPlite connections. I'm pretty sure above gsm0808_speech_codec_from_chan_type() should be here, outside the "if AoIP". It means that so far we fail to send the chosen speech codec back to the MSC for SCCPlite connections. It is mandatory for IP based user plane, which we use, so definitely needs to be fixed. See 3GPP TS 48.008 3.2.1.2 ASSIGNMENT COMPLETE. https://osmocom.org/issues/3528 -- To view, visit https://gerrit.osmocom.org/10774 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: I34d9281944b36cd89ad8e1c5774f0ea80fdfadc8 Gerrit-Change-Number: 10774 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Sep 2018 11:34: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 Sep 6 11:34:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 11:34:28 +0000 Subject: Change in osmo-bsc[master]: assignment: remove unnecessary call to gsm0808_speech_codec_from_chan... In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10774 ) Change subject: assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() ...................................................................... assignment: remove unnecessary call to gsm0808_speech_codec_from_chan_type() There is a function call to gsm0808_speech_codec_from_chan_type() after an if construct that checks if we need voice and if we need it if it is related to an AoIP connection. However, at the moment we call gsm0808_speech_codec_from_chan_type() all the time, even when just figured out that we don't need to. Presumably this is a refactory leftover. Lets remove the excess function call. Change-Id: I34d9281944b36cd89ad8e1c5774f0ea80fdfadc8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 41615ac..e1da45b 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -171,8 +171,6 @@ /* FIXME: AMR codec configuration must be derived from lchan1! */ } - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, chosen_channel, lchan->encr.alg_id, perm_spch, -- To view, visit https://gerrit.osmocom.org/10774 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: I34d9281944b36cd89ad8e1c5774f0ea80fdfadc8 Gerrit-Change-Number: 10774 Gerrit-PatchSet: 2 Gerrit-Owner: dexter 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 Sep 6 12:13:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:13:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update expected results Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10797 Change subject: update expected results ...................................................................... update expected results Change-Id: I32c29e62ca317937db771f8fb1540bb1fe9da2ab --- M bsc/expected-results.xml M bts/expected-results.xml M hlr/expected-results.xml M mgw/expected-results.xml M msc/expected-results.xml M sgsn/expected-results.xml 6 files changed, 57 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/10797/1 diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 7339951..33bc243 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -14,6 +14,7 @@ + @@ -69,22 +70,14 @@ - - Timeout of T_guard - BSC_Tests.ttcn:MASKED BSC_Tests control part - BSC_Tests.ttcn:MASKED TC_bssmap_clear_does_not_cause_bssmap_reset testcase - - - - Timeout of T_guard - BSC_Tests.ttcn:MASKED BSC_Tests control part - BSC_Tests.ttcn:MASKED TC_ms_rel_ind_does_not_cause_bssmap_reset testcase - - + + + + diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 8bfd305..73de1fb 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -87,7 +87,7 @@ - "Unexpected L2 fill frame received on Um" + Not enough fill frames received BTS_Tests.ttcn:MASKED BTS_Tests control part BTS_Tests.ttcn:MASKED TC_tch_sign_l2_fill_frame_dtxd testcase diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml index 039c1f7..5431b78 100644 --- a/hlr/expected-results.xml +++ b/hlr/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -10,4 +10,11 @@ + + + + + + + diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index 92b9351..b45ba1f 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -1,12 +1,10 @@ - + no verdict - - Dynamic test case error: Using the value of an optional field containing omit. - + @@ -30,16 +28,12 @@ - + - - RTP packet payload type errors occurred - - - RTP packet payload type errors occurred - + + diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 296d918..8d9180f 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -1,20 +1,10 @@ - + - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_imsi_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_imsi_timeout_gsup testcase - - + + @@ -54,7 +44,10 @@ - + Received unexpected BSSAP instead of CM SERV REJ + MSC_Tests.ttcn:MASKED MSC_Tests control part + MSC_Tests.ttcn:MASKED TC_gsup_cancel testcase + @@ -70,10 +63,11 @@ - + + diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index bb38a7c..459355a 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -32,21 +32,30 @@ + + + + + + + Did not received GMM Attach Complete. + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_check_complete_resend testcase + + Unexpected GMM Detach Request SGSN_Tests.ttcn:MASKED SGSN_Tests control part SGSN_Tests.ttcn:MASKED TC_hlr_location_cancel_request_update testcase - - Dynamic test case error: Guard timer has expired. Execution of current test case will be interrupted. - - - Dynamic test case error: Guard timer has expired. Execution of current test case will be interrupted. - + + + + @@ -58,10 +67,19 @@ - + Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_second_attempt testcase + - + + + Unexpected GMM ID REQ (IMEI). + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_gmm_attach_req_while_gmm_attach testcase + + -- To view, visit https://gerrit.osmocom.org/10797 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: I32c29e62ca317937db771f8fb1540bb1fe9da2ab Gerrit-Change-Number: 10797 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:14:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:14:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update expected results In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10797 ) Change subject: update expected results ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10797 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: I32c29e62ca317937db771f8fb1540bb1fe9da2ab Gerrit-Change-Number: 10797 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Sep 2018 12:14:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:14:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:14:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update expected results In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10797 ) Change subject: update expected results ...................................................................... update expected results Change-Id: I32c29e62ca317937db771f8fb1540bb1fe9da2ab --- M bsc/expected-results.xml M bts/expected-results.xml M hlr/expected-results.xml M mgw/expected-results.xml M msc/expected-results.xml M sgsn/expected-results.xml 6 files changed, 57 insertions(+), 51 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 7339951..33bc243 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -14,6 +14,7 @@ + @@ -69,22 +70,14 @@ - - Timeout of T_guard - BSC_Tests.ttcn:MASKED BSC_Tests control part - BSC_Tests.ttcn:MASKED TC_bssmap_clear_does_not_cause_bssmap_reset testcase - - - - Timeout of T_guard - BSC_Tests.ttcn:MASKED BSC_Tests control part - BSC_Tests.ttcn:MASKED TC_ms_rel_ind_does_not_cause_bssmap_reset testcase - - + + + + diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 8bfd305..73de1fb 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -87,7 +87,7 @@ - "Unexpected L2 fill frame received on Um" + Not enough fill frames received BTS_Tests.ttcn:MASKED BTS_Tests control part BTS_Tests.ttcn:MASKED TC_tch_sign_l2_fill_frame_dtxd testcase diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml index 039c1f7..5431b78 100644 --- a/hlr/expected-results.xml +++ b/hlr/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -10,4 +10,11 @@ + + + + + + + diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index 92b9351..b45ba1f 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -1,12 +1,10 @@ - + no verdict - - Dynamic test case error: Using the value of an optional field containing omit. - + @@ -30,16 +28,12 @@ - + - - RTP packet payload type errors occurred - - - RTP packet payload type errors occurred - + + diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 296d918..8d9180f 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -1,20 +1,10 @@ - + - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_imsi_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_imsi_timeout_gsup testcase - - + + @@ -54,7 +44,10 @@ - + Received unexpected BSSAP instead of CM SERV REJ + MSC_Tests.ttcn:MASKED MSC_Tests control part + MSC_Tests.ttcn:MASKED TC_gsup_cancel testcase + @@ -70,10 +63,11 @@ - + + diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index bb38a7c..459355a 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -32,21 +32,30 @@ + + + + + + + Did not received GMM Attach Complete. + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_check_complete_resend testcase + + Unexpected GMM Detach Request SGSN_Tests.ttcn:MASKED SGSN_Tests control part SGSN_Tests.ttcn:MASKED TC_hlr_location_cancel_request_update testcase - - Dynamic test case error: Guard timer has expired. Execution of current test case will be interrupted. - - - Dynamic test case error: Guard timer has expired. Execution of current test case will be interrupted. - + + + + @@ -58,10 +67,19 @@ - + Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_second_attempt testcase + - + + + Unexpected GMM ID REQ (IMEI). + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_gmm_attach_req_while_gmm_attach testcase + + -- To view, visit https://gerrit.osmocom.org/10797 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: I32c29e62ca317937db771f8fb1540bb1fe9da2ab Gerrit-Change-Number: 10797 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 Thu Sep 6 12:15:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 12:15:58 +0000 Subject: Change in osmo-iuh[master]: debian: packag osmo-hnbgw.service Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10798 Change subject: debian: packag osmo-hnbgw.service ...................................................................... debian: packag osmo-hnbgw.service Change-Id: I7b488ddb07916952adab921415ca373aa7c5c1e8 --- A debian/osmo-hnbgw.service 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/98/10798/1 diff --git a/debian/osmo-hnbgw.service b/debian/osmo-hnbgw.service new file mode 120000 index 0000000..e69ea55 --- /dev/null +++ b/debian/osmo-hnbgw.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-hnbgw.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10798 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: I7b488ddb07916952adab921415ca373aa7c5c1e8 Gerrit-Change-Number: 10798 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 Sep 6 12:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 12:16:07 +0000 Subject: Change in osmo-iuh[master]: debian: package osmo-hnbgw.service In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10798 ) Change subject: debian: package osmo-hnbgw.service ...................................................................... debian: package osmo-hnbgw.service Change-Id: I7b488ddb07916952adab921415ca373aa7c5c1e8 --- A debian/osmo-hnbgw.service 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/98/10798/2 -- To view, visit https://gerrit.osmocom.org/10798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7b488ddb07916952adab921415ca373aa7c5c1e8 Gerrit-Change-Number: 10798 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:21:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 12:21:14 +0000 Subject: Change in osmo-mgw[master]: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10495 ) Change subject: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp ...................................................................... Set Ready For Review -- 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: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Sep 2018 12:21:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 12:22:57 +0000 Subject: Change in osmo-mgw[master]: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10495 ) Change subject: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp ...................................................................... Patch Set 4: Marking as ready for review as I went through osmo-bsc commits and backported them to openbsc a few days/weeks ago. Not exactly everything since in osmo-bsc the libosmo-legacy-mgcp was splitted from main osmo-bsc-mgcp binary, but we don't really need that in openbsc anyway since that executable is the only user. -- 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: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Sep 2018 12:22: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 Sep 6 12:33:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Sep 2018 12:33:54 +0000 Subject: Change in osmo-bts[master]: measurement: display fn_mod when measuremnet is added In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10762 ) Change subject: measurement: display fn_mod when measuremnet is added ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/10762 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: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a Gerrit-Change-Number: 10762 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: Thu, 06 Sep 2018 12:33: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 Sep 6 12:33:57 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Sep 2018 12:33:57 +0000 Subject: Change in osmo-bts[master]: measurement: display fn_mod when measuremnet is added In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/10762 ) Change subject: measurement: display fn_mod when measuremnet is added ...................................................................... measurement: display fn_mod when measuremnet is added When adding a new measurement also log the frame number by the modulus of the measurement interval to simplify debuggung Change-Id: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a --- M src/common/measurement.c 1 file changed, 32 insertions(+), 7 deletions(-) Approvals: dexter: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index 59f5d83..1e547c8 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -415,21 +415,46 @@ return false; } +/* determine the measurement interval modulus by a given lchan */ +static uint8_t modulus_by_lchan(struct gsm_lchan *lchan) +{ + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + return 104; + break; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + return 102; + break; + default: + /* Invalid */ + return 1; + break; + } +} + /* 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) { + uint32_t fn_mod = fn % modulus_by_lchan(lchan); + if (lchan->state != LCHAN_S_ACTIVE) { LOGPFN(DMEAS, LOGL_NOTICE, fn, - "%s measurement during state: %s, num_ul_meas=%d\n", - gsm_lchan_name(lchan), gsm_lchans_name(lchan->state), - lchan->meas.num_ul_meas); + "%s measurement during state: %s, num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), gsm_lchans_name(lchan->state), + lchan->meas.num_ul_meas, fn_mod); } if (lchan->meas.num_ul_meas >= ARRAY_SIZE(lchan->meas.uplink)) { LOGPFN(DMEAS, LOGL_NOTICE, fn, - "%s no space for uplink measurement, num_ul_meas=%d\n", - gsm_lchan_name(lchan), lchan->meas.num_ul_meas); + "%s no space for uplink measurement, num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), lchan->meas.num_ul_meas, fn_mod); return -ENOSPC; } @@ -438,8 +463,8 @@ if (!ulm->is_sub) ulm->is_sub = ts45008_83_is_sub(lchan, fn, false); - DEBUGPFN(DMEAS, fn, "%s adding measurement (is_sub=%u), num_ul_meas=%d\n", - gsm_lchan_name(lchan), ulm->is_sub, lchan->meas.num_ul_meas); + DEBUGPFN(DMEAS, fn, "%s adding measurement (is_sub=%u), num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), ulm->is_sub, lchan->meas.num_ul_meas, fn_mod); memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm, sizeof(*ulm)); -- To view, visit https://gerrit.osmocom.org/10762 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: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a Gerrit-Change-Number: 10762 Gerrit-PatchSet: 2 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 Thu Sep 6 12:35:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:35:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: compare_results.sh: speed up comparison loop Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10799 Change subject: compare_results.sh: speed up comparison loop ...................................................................... compare_results.sh: speed up comparison loop The script takes quite long to parse each and every line O(n**2). Rather directly pick only those lines that contain the test name in the grep that feeds into the loop. Change-Id: I0d4987b11c3feaef3a7fc56d764c43386865004f --- M compare-results.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/10799/1 diff --git a/compare-results.sh b/compare-results.sh index cb80a0d..708f59d 100755 --- a/compare-results.sh +++ b/compare-results.sh @@ -112,7 +112,7 @@ fi matched="1" break - done <<< "$(grep " -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:35:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:35:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: compare_results.sh: less drastic wording Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10800 Change subject: compare_results.sh: less drastic wording ...................................................................... compare_results.sh: less drastic wording We don't currently fail test runs from mismatching results, it's just for human convenience. So don't say things like "Failing due to skipped tests", it's confusing. Summarize once the need to update results instead. Change-Id: Ibafa75bd54df07253780c6af3a68a0a4d148e64b --- M compare-results.sh 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/10800/1 diff --git a/compare-results.sh b/compare-results.sh index 708f59d..cce3a8d 100755 --- a/compare-results.sh +++ b/compare-results.sh @@ -152,6 +152,8 @@ echo "--------------------" overall_verdict=0 +ask_update="" + if [ "x$pass" != x0 ]; then echo "$pass pass" fi @@ -162,25 +164,25 @@ if [ "x$skipped" != x0 ]; then echo "$skipped skipped" + ask_update="$ask_update removed=$skipped" if [ "x$allow_skip" = x0 ]; then overall_verdict=4 - echo " Failing due to skipped tests. If tests were removed, update the expected results!" fi fi if [ "x$new" != x0 ]; then echo "$new new" + ask_update="$ask_update new=$new" if [ "x$allow_new" = x0 ]; then overall_verdict=3 - echo " Failing due to new tests. Update the expected results!" fi fi if [ "x$more_successes" != x0 ]; then echo "$more_successes pass unexpectedly" + ask_update="$ask_update xpass=$more_successes" if [ "x$allow_xpass" = x0 ]; then overall_verdict=2 - echo " Update the expected results!" fi fi @@ -189,10 +191,9 @@ overall_verdict=1 fi -echo -if [ "x$overall_verdict" != x0 ]; then - echo "FAILURE" -else - echo "ok" +if [ -n "$ask_update" ]; then + echo + echo "(Please update the expected results:$ask_update)" fi + exit $overall_verdict -- To view, visit https://gerrit.osmocom.org/10800 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: Ibafa75bd54df07253780c6af3a68a0a4d148e64b Gerrit-Change-Number: 10800 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:35:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:35:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: compare_results.sh: less drastic wording In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10800 ) Change subject: compare_results.sh: less drastic wording ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10800 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: Ibafa75bd54df07253780c6af3a68a0a4d148e64b Gerrit-Change-Number: 10800 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 12:35:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 12:35:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:35:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: compare_results.sh: speed up comparison loop In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10799 ) Change subject: compare_results.sh: speed up comparison loop ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10799 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: I0d4987b11c3feaef3a7fc56d764c43386865004f Gerrit-Change-Number: 10799 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Sep 2018 12:35: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 Sep 6 12:35:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:35:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: compare_results.sh: speed up comparison loop In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10799 ) Change subject: compare_results.sh: speed up comparison loop ...................................................................... compare_results.sh: speed up comparison loop The script takes quite long to parse each and every line O(n**2). Rather directly pick only those lines that contain the test name in the grep that feeds into the loop. Change-Id: I0d4987b11c3feaef3a7fc56d764c43386865004f --- M compare-results.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/compare-results.sh b/compare-results.sh index cb80a0d..708f59d 100755 --- a/compare-results.sh +++ b/compare-results.sh @@ -112,7 +112,7 @@ fi matched="1" break - done <<< "$(grep " 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 Sep 6 12:35:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 12:35:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: compare_results.sh: less drastic wording In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10800 ) Change subject: compare_results.sh: less drastic wording ...................................................................... compare_results.sh: less drastic wording We don't currently fail test runs from mismatching results, it's just for human convenience. So don't say things like "Failing due to skipped tests", it's confusing. Summarize once the need to update results instead. Change-Id: Ibafa75bd54df07253780c6af3a68a0a4d148e64b --- M compare-results.sh 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/compare-results.sh b/compare-results.sh index 708f59d..cce3a8d 100755 --- a/compare-results.sh +++ b/compare-results.sh @@ -152,6 +152,8 @@ echo "--------------------" overall_verdict=0 +ask_update="" + if [ "x$pass" != x0 ]; then echo "$pass pass" fi @@ -162,25 +164,25 @@ if [ "x$skipped" != x0 ]; then echo "$skipped skipped" + ask_update="$ask_update removed=$skipped" if [ "x$allow_skip" = x0 ]; then overall_verdict=4 - echo " Failing due to skipped tests. If tests were removed, update the expected results!" fi fi if [ "x$new" != x0 ]; then echo "$new new" + ask_update="$ask_update new=$new" if [ "x$allow_new" = x0 ]; then overall_verdict=3 - echo " Failing due to new tests. Update the expected results!" fi fi if [ "x$more_successes" != x0 ]; then echo "$more_successes pass unexpectedly" + ask_update="$ask_update xpass=$more_successes" if [ "x$allow_xpass" = x0 ]; then overall_verdict=2 - echo " Update the expected results!" fi fi @@ -189,10 +191,9 @@ overall_verdict=1 fi -echo -if [ "x$overall_verdict" != x0 ]; then - echo "FAILURE" -else - echo "ok" +if [ -n "$ask_update" ]; then + echo + echo "(Please update the expected results:$ask_update)" fi + exit $overall_verdict -- To view, visit https://gerrit.osmocom.org/10800 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: Ibafa75bd54df07253780c6af3a68a0a4d148e64b Gerrit-Change-Number: 10800 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 Thu Sep 6 13:03:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:03:19 +0000 Subject: Change in osmocom-bb[master]: osmocon: Add --enable-{werror, sanitize} configure flags Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10801 Change subject: osmocon: Add --enable-{werror,sanitize} configure flags ...................................................................... osmocon: Add --enable-{werror,sanitize} configure flags Change-Id: I6a69ca514406fa18684ca2621be45f87ee8d64a4 --- M src/host/osmocon/configure.ac 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/10801/1 diff --git a/src/host/osmocon/configure.ac b/src/host/osmocon/configure.ac index 4130800..a42f487 100644 --- a/src/host/osmocon/configure.ac +++ b/src/host/osmocon/configure.ac @@ -21,5 +21,32 @@ dnl Checks for typedefs, structures and compiler characteristics +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 + AC_OUTPUT( Makefile) -- To view, visit https://gerrit.osmocom.org/10801 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: I6a69ca514406fa18684ca2621be45f87ee8d64a4 Gerrit-Change-Number: 10801 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:03:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:03:19 +0000 Subject: Change in osmocom-bb[master]: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10802 Change subject: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... osmocon: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I3ab69a971be555c9f9b5b7a7e5da53008a119504 --- M src/host/osmocon/osmocon.c 1 file changed, 4 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/02/10802/1 diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index 6075e61..139c2db 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -1,6 +1,6 @@ /* osmocon */ -/* (C) 2010 by Harald Welte +/* (C) 2010,2018 by Harald Welte * (C) 2010 by Holger Hans Peter Freyther * (C) 2010 by Steve Markgraf * @@ -45,6 +45,7 @@ #include #include #include +#include #include @@ -1333,46 +1334,14 @@ uint8_t dlci) { struct osmo_fd *bfd = &ts->bfd; - struct sockaddr_un local; - unsigned int namelen; int rc; - bfd->fd = socket(AF_UNIX, SOCK_STREAM, 0); - - if (bfd->fd < 0) { + rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, path, OSMO_SOCK_F_BIND); + if (rc < 0) { fprintf(stderr, "Failed to create Unix Domain Socket.\n"); return -1; } - local.sun_family = AF_UNIX; - strncpy(local.sun_path, path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; - unlink(local.sun_path); - - /* we use the same magic that X11 uses in Xtranssock.c for - * calculating the proper length of the sockaddr */ -#if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); -#endif -#if defined(BSD44SOCKETS) || defined(SUN_LEN) - namelen = SUN_LEN(&local); -#else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); -#endif - - rc = bind(bfd->fd, (struct sockaddr *) &local, namelen); - if (rc != 0) { - fprintf(stderr, "Failed to bind the unix domain socket. '%s'\n", - local.sun_path); - return -1; - } - - if (listen(bfd->fd, 0) != 0) { - fprintf(stderr, "Failed to listen.\n"); - return -1; - } - bfd->when = BSC_FD_READ; bfd->cb = tool_accept; bfd->data = ts; -- To view, visit https://gerrit.osmocom.org/10802 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: I3ab69a971be555c9f9b5b7a7e5da53008a119504 Gerrit-Change-Number: 10802 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:03:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:03:19 +0000 Subject: Change in osmocom-bb[master]: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10803 Change subject: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... osmoload: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e --- M src/host/osmocon/osmoload.c 1 file changed, 4 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/03/10803/1 diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index 1c20382..5b56208 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -1,6 +1,7 @@ /* control utility for the Calypso bootloader */ /* (C) 2010 by Ingo Albrecht + * (C) 2018 by Harald Welte * * All Rights Reserved * @@ -39,6 +40,7 @@ #include #include #include +#include #include @@ -493,23 +495,11 @@ static void loader_connect(const char *socket_path) { int rc; - struct sockaddr_un local; struct osmo_fd *conn = &connection; - local.sun_family = AF_UNIX; - strncpy(local.sun_path, socket_path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; - - conn->fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (conn->fd < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); - exit(1); - } - - rc = connect(conn->fd, (struct sockaddr *) &local, - sizeof(local.sun_family) + strlen(local.sun_path)); + rc = osmo_sock_unix_init_ofd(conn, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to connect to '%s'.\n", local.sun_path); + fprintf(stderr, "Failed to create unix domain socket.\n"); exit(1); } -- To view, visit https://gerrit.osmocom.org/10803 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: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e Gerrit-Change-Number: 10803 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:05:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:05:55 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10773 ) Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Patch Set 1: Code-Review+1 I think the commit log should mention where the $USER is coming from -- it's not directly from the env, but taking advantage of the fact that make/Makefile already feeds the env's $USER in as commandline build argument. Otherwise very nice. -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:05:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:07:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 13:07:31 +0000 Subject: Change in osmocom-bb[master]: osmocon: Add --enable-{werror, sanitize} configure flags In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10801 ) Change subject: osmocon: Add --enable-{werror,sanitize} configure flags ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10801 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: I6a69ca514406fa18684ca2621be45f87ee8d64a4 Gerrit-Change-Number: 10801 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:07: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 Sep 6 13:07:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 13:07:34 +0000 Subject: Change in osmo-pcu[master]: Cleanup of systemd service files Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10804 Change subject: Cleanup of systemd service files ...................................................................... Cleanup of systemd service files Let's use a symlink in debian/ as we do in other projects, and merge the two service files since anyway they call the same binary. Change-Id: Ibd82ec12cbeb73a27ca5860266587efb58be14ab --- M contrib/osmo-pcu.service D contrib/sysmopcu.service D debian/osmo-pcu.service A debian/osmo-pcu.service 4 files changed, 2 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/04/10804/1 diff --git a/contrib/osmo-pcu.service b/contrib/osmo-pcu.service index 3066a66..6329d31 100644 --- a/contrib/osmo-pcu.service +++ b/contrib/osmo-pcu.service @@ -1,5 +1,5 @@ [Unit] -Description=sysmocom sysmoPCU +Description=Osmocom osmo-pcu [Service] Type=simple @@ -14,4 +14,3 @@ [Install] WantedBy=multi-user.target -Alias=sysmopcu.service diff --git a/contrib/sysmopcu.service b/contrib/sysmopcu.service deleted file mode 100644 index df8c47e..0000000 --- a/contrib/sysmopcu.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=sysmocom sysmoPCU - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg -Restart=always -RestartSec=2 -RestartPreventExitStatus=1 - -# The msg queues must be read fast enough -CPUSchedulingPolicy=rr -CPUSchedulingPriority=1 - -[Install] -WantedBy=multi-user.target -Alias=osmo-pcu.service diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service deleted file mode 100644 index 850a715..0000000 --- a/debian/osmo-pcu.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Osmocom osmo-pcu - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg -Restart=always -RestartSec=2 - -# Read quickly enough -CPUSchedulingPolicy=rr -CPUSchedulingPriority=1 - -[Install] -WantedBy=multi-user.target diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service new file mode 120000 index 0000000..f077431 --- /dev/null +++ b/debian/osmo-pcu.service @@ -0,0 +1 @@ +../contrib/osmo-pcu.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10804 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: Ibd82ec12cbeb73a27ca5860266587efb58be14ab Gerrit-Change-Number: 10804 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 Sep 6 13:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 13:08:21 +0000 Subject: Change in osmocom-bb[master]: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10802 ) Change subject: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10802 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: I3ab69a971be555c9f9b5b7a7e5da53008a119504 Gerrit-Change-Number: 10802 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:08: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 Sep 6 13:10:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:10:12 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_sock_unix_init_ofd() from libosmocore Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10805 Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... layer23: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I57c724c78dbbbce0546ebe914e370f32c8c89703 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/mncc_sock.c 3 files changed, 10 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/10805/1 diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 3e9cee4..7f29692 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -1,7 +1,7 @@ /* Layer 1 socket interface of layer2/3 stack */ /* (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by Harald Welte + * (C) 2010,2018 by Harald Welte * * All Rights Reserved * @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -105,23 +106,10 @@ int layer2_open(struct osmocom_ms *ms, const char *socket_path) { int rc; - struct sockaddr_un local; - ms->l2_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (ms->l2_wq.bfd.fd < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); - return ms->l2_wq.bfd.fd; - } - - local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); - - rc = connect(ms->l2_wq.bfd.fd, (struct sockaddr *) &local, - sizeof(local)); + rc = osmo_sock_unix_init_ofd(&ms->l2_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to connect to '%s': %s\n", local.sun_path, - strerror(errno)); - close(ms->l2_wq.bfd.fd); + fprintf(stderr, "Failed to create unix domain socket.\n"); return rc; } diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index e18bb31..8d95214 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -1,7 +1,7 @@ /* BTSAP socket interface of layer2/3 stack */ /* (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by Harald Welte + * (C) 2010,2018 by Harald Welte * (C) 2010 by Andreas Eversberg * (C) 2011 by Nico Golde * @@ -499,22 +499,10 @@ int sap_open(struct osmocom_ms *ms, const char *socket_path) { ssize_t rc; - struct sockaddr_un local; - ms->sap_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (ms->sap_wq.bfd.fd < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); - return ms->sap_wq.bfd.fd; - } - - local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); - - rc = connect(ms->sap_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local)); + rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to connect to '%s'\n", local.sun_path); - ms->sap_entity.sap_state = SAP_SOCKET_ERROR; - close(ms->sap_wq.bfd.fd); + fprintf(stderr, "Failed to create unix domain socket.\n"); return rc; } diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 39eb7bc..cc769ae 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -1,6 +1,6 @@ /* mncc_sock.c: Tie the MNCC interface to a unix domain socket */ -/* (C) 2008-2010 by Harald Welte +/* (C) 2008-2011,2018 by Harald Welte * (C) 2009,2011 by Andreas Eversberg * All Rights Reserved * @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -80,9 +81,6 @@ state->conn_bfd.when |= BSC_FD_WRITE; } -/* FIXME: move this to libosmocore */ -int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path); - static void mncc_sock_close(struct mncc_sock_state *state) { struct osmo_fd *bfd = &state->conn_bfd; @@ -268,7 +266,7 @@ bfd = &state->listen_bfd; - rc = osmo_unixsock_listen(bfd, SOCK_SEQPACKET, name); + rc = osmo_sock_unix_init_ofd(bfd, SOCK_SEQPACKET, 0, name, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DMNCC, LOGL_ERROR, "Could not create unix socket: %s\n", strerror(errno)); @@ -299,49 +297,3 @@ close(state->listen_bfd.fd); talloc_free(state); } - -/* FIXME: move this to libosmocore */ -int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path) -{ - struct sockaddr_un local; - unsigned int namelen; - int rc; - - bfd->fd = socket(AF_UNIX, type, 0); - - if (bfd->fd < 0) { - fprintf(stderr, "Failed to create Unix Domain Socket.\n"); - return -1; - } - - local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; - unlink(local.sun_path); - - /* we use the same magic that X11 uses in Xtranssock.c for - * calculating the proper length of the sockaddr */ -#if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); -#endif -#if defined(BSD44SOCKETS) || defined(SUN_LEN) - namelen = SUN_LEN(&local); -#else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); -#endif - - rc = bind(bfd->fd, (struct sockaddr *) &local, namelen); - if (rc != 0) { - fprintf(stderr, "Failed to bind the unix domain socket. '%s'\n", - local.sun_path); - return -1; - } - - if (listen(bfd->fd, 0) != 0) { - fprintf(stderr, "Failed to listen.\n"); - return -1; - } - - return 0; -} -- To view, visit https://gerrit.osmocom.org/10805 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: I57c724c78dbbbce0546ebe914e370f32c8c89703 Gerrit-Change-Number: 10805 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:11:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 13:11:36 +0000 Subject: Change in osmocom-bb[master]: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10803 ) Change subject: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10803 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: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e Gerrit-Change-Number: 10803 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:11: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 Sep 6 13:15:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 13:15:48 +0000 Subject: Change in osmo-sgsn[master]: Add osmo-gtphub systemd service file Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10806 Change subject: Add osmo-gtphub systemd service file ...................................................................... Add osmo-gtphub systemd service file Change-Id: I7ecfc9aa55611ae9975e5ef8c0716dae7598524c --- A contrib/systemd/osmo-gtphub.service A debian/osmo-gtphub.service 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/06/10806/1 diff --git a/contrib/systemd/osmo-gtphub.service b/contrib/systemd/osmo-gtphub.service new file mode 100644 index 0000000..4881785 --- /dev/null +++ b/contrib/systemd/osmo-gtphub.service @@ -0,0 +1,12 @@ +[Unit] +Description=Osmocom GTP Hub + +[Service] +Type=simple +ExecStart=/usr/bin/osmo-gtphub -c /etc/osmocom/osmo-gtphub.cfg +Restart=always +RestartSec=2 +RestartPreventExitStatus=1 + +[Install] +WantedBy=multi-user.target diff --git a/debian/osmo-gtphub.service b/debian/osmo-gtphub.service new file mode 120000 index 0000000..81a0eb4 --- /dev/null +++ b/debian/osmo-gtphub.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-gtphub.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10806 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: I7ecfc9aa55611ae9975e5ef8c0716dae7598524c Gerrit-Change-Number: 10806 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 Sep 6 13:16:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 13:16:58 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10805 ) Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10805/1/src/host/layer23/src/common/sap_interface.c File src/host/layer23/src/common/sap_interface.c: https://gerrit.osmocom.org/#/c/10805/1/src/host/layer23/src/common/sap_interface.c at a516 PS1, Line 516: Shouldn't we keep this? https://gerrit.osmocom.org/#/c/10805/1/src/host/layer23/src/common/sap_interface.c at 503 PS1, Line 503: rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); It seems the include is missing... -- To view, visit https://gerrit.osmocom.org/10805 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: I57c724c78dbbbce0546ebe914e370f32c8c89703 Gerrit-Change-Number: 10805 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:16:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 13:18:34 +0000 Subject: Change in osmo-sip-connector[master]: debian: Use osmo-sip-connector.service from contrib Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10807 Change subject: debian: Use osmo-sip-connector.service from contrib ...................................................................... debian: Use osmo-sip-connector.service from contrib Use a symlink to avoid duplicating content. Remove nonsense Wants= line on itself. Change-Id: I556a91e012692c4073b4b832bccce0c850f684f8 --- M contrib/systemd/osmo-sip-connector.service D debian/osmo-sip-connector.service A debian/osmo-sip-connector.service 3 files changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/07/10807/1 diff --git a/contrib/systemd/osmo-sip-connector.service b/contrib/systemd/osmo-sip-connector.service index e44ab9b..a08f167 100644 --- a/contrib/systemd/osmo-sip-connector.service +++ b/contrib/systemd/osmo-sip-connector.service @@ -1,6 +1,5 @@ [Unit] Description=Osmo SIP Connector -Wants=osmo-sip-connector.service [Service] Type=simple diff --git a/debian/osmo-sip-connector.service b/debian/osmo-sip-connector.service deleted file mode 100644 index 6694a17..0000000 --- a/debian/osmo-sip-connector.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Osmocom osmo-sip-connector - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-sip-connector -c /etc/osmocom/osmo-sip-connector.cfg -Restart=always -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/debian/osmo-sip-connector.service b/debian/osmo-sip-connector.service new file mode 120000 index 0000000..c0ae1e1 --- /dev/null +++ b/debian/osmo-sip-connector.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-sip-connector.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10807 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: I556a91e012692c4073b4b832bccce0c850f684f8 Gerrit-Change-Number: 10807 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 Sep 6 13:24:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Sep 2018 13:24:34 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10773 to look at the new patch set (#2). Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Fix "'laforge/debian-jessie-build' not found" Instead of hardcoding laforge's username in all FROM statements in the Dockerfiles, make use of the USER variable (as passed through by the "make/Makefile" with "docker build --build-arg USER=..."). Thanks to fixeria for proposing this fix! This requires running docker-ce, old versions of docker (such as the one in the official repositories of the latest Fedora) don't support variables in the FROM line. But docker-ce can be installed after adding docker's 3rd party repositories. Closes: OS#3457 Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f --- M debian-jessie-buildslave-st/Dockerfile M debian-jessie-buildslave/Dockerfile M osmo-bsc-master/Dockerfile M osmo-bts-master/Dockerfile M osmo-gerrit-libosmo/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-mgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-nitb-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmocom-bb-host-master/Dockerfile M sctp-test/Dockerfile M sigtran-tests/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile 26 files changed, 52 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/73/10773/2 -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:25:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 13:25:52 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10782 ) Change subject: grgsm_trx: Migrated argument parsing to argparse ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/10782/1/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10782/1/apps/grgsm_trx at a180 PS1, Line 180: Also, I guess this wouldn't work anymore... https://gerrit.osmocom.org/#/c/10782/1/apps/grgsm_trx at 26 PS1, Line 26: import getopt This dependency is not required anymore. To have a cleaner change, I would place the import of argparse here. https://gerrit.osmocom.org/#/c/10782/1/apps/grgsm_trx at 44 PS1, Line 44: class grgsm_trx: Changing the class name is not related to the argv handling. https://gerrit.osmocom.org/#/c/10782/1/apps/grgsm_trx at 155 PS1, Line 155: app = grgsm_trx( I think we can pass the parsing result directly to the init function. -- To view, visit https://gerrit.osmocom.org/10782 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: Idf99fd7a581464aa2f77fe01e721dbd162686811 Gerrit-Change-Number: 10782 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:25:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:27:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:27:29 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10808 Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... add vty config for GSMTAP-SAPI host (-i) So far, the only way to configure the target for SAPI GSMTAP is to use the cmdline argument -i. Add a vty command to allow configuring from cfg file. Add 'bts 0' / 'gsmtap-host HOSTNAME' and 'no gsmtap-host'. The -i option, if provided, overrides the cfg file option. In order to set up the SAPI GSMTAP socket after reading the config file, shift the socket init a bit further down in main.c. BTW, if the user passed an -i option, the gsmtap host shows up in 'show running-config' and hence will also appear in 'write file'. Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 --- M include/osmo-bts/gsm_data_shared.h M src/common/main.c M src/common/vty.c 3 files changed, 52 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10808/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 794eaea..ef468cb 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -747,6 +747,7 @@ struct osmo_timer_list fn_timer; } vbts; + char *gsmtap_sapi_host; }; diff --git a/src/common/main.c b/src/common/main.c index 9121a2a..c08088a 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -275,15 +275,6 @@ } } - if (gsmtap_ip) { - gsmtap = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); - if (!gsmtap) { - fprintf(stderr, "Failed during gsmtap_init()\n"); - exit(1); - } - gsmtap_source_add_sink(gsmtap); - } - if (bts_init(bts) < 0) { fprintf(stderr, "unable to open bts\n"); exit(1); @@ -313,6 +304,26 @@ write_pid_file("osmo-bts"); + /* Accept a GSMTAP-SAPI host from VTY config, but a commandline option overrides that. */ + if (gsmtap_ip) { + if (bts->gsmtap_sapi_host) { + LOGP(DLGLOBAL, LOGL_NOTICE, + "Command line argument -i overrides 'gsmtap-host' config\n"); + talloc_free(bts->gsmtap_sapi_host); + } + bts->gsmtap_sapi_host = talloc_strdup(bts, gsmtap_ip); + } + if (bts->gsmtap_sapi_host) { + LOGP(DLGLOBAL, LOGL_NOTICE, "Setting up GSMTAP SAPI forwarding to %s:%d\n", + bts->gsmtap_sapi_host, GSMTAP_UDP_PORT); + gsmtap = gsmtap_source_init(bts->gsmtap_sapi_host, GSMTAP_UDP_PORT, 1); + if (!gsmtap) { + fprintf(stderr, "Failed during gsmtap_init()\n"); + exit(1); + } + gsmtap_source_add_sink(gsmtap); + } + bts_controlif_setup(bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS); rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(), diff --git a/src/common/vty.c b/src/common/vty.c index 6061335..98e874f 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -276,6 +276,8 @@ bts->agch_queue.thresh_level, bts->agch_queue.low_level, bts->agch_queue.high_level, VTY_NEWLINE); + if (bts->gsmtap_sapi_host) + vty_out(vty, " gsmtap-host %s%s", bts->gsmtap_sapi_host, VTY_NEWLINE); for (i = 0; i < 32; i++) { if (gsmtap_sapi_mask & (1 << i)) { osmo_str2lower(buf_casecnvt, get_value_string(gsmtap_sapi_names, i)); @@ -1392,6 +1394,33 @@ return CMD_SUCCESS; } +#define GSMTAP_HOST_STR \ + "Set the host to send GSMTAP of selected SAPIs to, see gsmtap-sapi and command line option -i." \ + " (Not related to 'log gsmtap'.)\n" + +DEFUN(cfg_bts_gsmtap_host, cfg_bts_gsmtap_host_cmd, + "gsmtap-host HOSTNAME", + GSMTAP_HOST_STR + "Remote IP address or hostname\n") +{ + struct gsm_bts *bts = vty->index; + if (bts->gsmtap_sapi_host) + talloc_free(bts->gsmtap_sapi_host); + bts->gsmtap_sapi_host = talloc_strdup(bts, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_no_gsmtap_host, cfg_bts_no_gsmtap_host_cmd, + "no gsmtap-host", + NO_STR GSMTAP_HOST_STR) +{ + struct gsm_bts *bts = vty->index; + if (bts->gsmtap_sapi_host) + talloc_free(bts->gsmtap_sapi_host); + bts->gsmtap_sapi_host = NULL; + return CMD_SUCCESS; +} + static struct cmd_node phy_node = { PHY_NODE, "%s(phy)# ", @@ -1609,6 +1638,8 @@ install_element(BTS_NODE, &cfg_bts_supp_meas_toa256_cmd); install_element(BTS_NODE, &cfg_bts_no_supp_meas_toa256_cmd); + install_element(BTS_NODE, &cfg_bts_gsmtap_host_cmd); + install_element(BTS_NODE, &cfg_bts_no_gsmtap_host_cmd); install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_cmd); install_element(BTS_NODE, &cfg_trx_no_gsmtap_sapi_cmd); -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:28:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:28:38 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10773 ) Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:28: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 Sep 6 13:42:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: cosmetically re-arrange reply_to() args In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10746 ) Change subject: mgcp_client_test: cosmetically re-arrange reply_to() args ...................................................................... mgcp_client_test: cosmetically re-arrange reply_to() args I want to test arbitrary length Conn IDs ('I:'), and hence don't want to pass the conn_id as int, but rather just include it in the message string. Prepare for that by eliminating the extra conn_id arg and just pass a params string. Change-Id: Ib2e718dda3aa1f6e9979dee823d973dd002e2318 --- M tests/mgcp_client/mgcp_client_test.c 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 2662fc1..84ba3b4 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -77,14 +77,14 @@ struct mgcp_client *mgcp = NULL; static int reply_to(mgcp_trans_id_t trans_id, int code, const char *comment, - int conn_id, const char *params) + const char *params) { static char compose[4096 - 128]; int len; len = snprintf(compose, sizeof(compose), - "%d %u %s\r\nI: %d\n\n%s", - code, trans_id, comment, conn_id, params); + "%d %u %s\r\n%s", + code, trans_id, comment, params); OSMO_ASSERT(len < sizeof(compose)); OSMO_ASSERT(len > 0); @@ -148,7 +148,8 @@ msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); trans_id = dummy_mgcp_send(msg); - reply_to(trans_id, 200, "OK", 1, + reply_to(trans_id, 200, "OK", + "I: 1\n\n" "v=0\r\n" "o=- 1 23 IN IP4 10.9.1.120\r\n" "s=-\r\n" @@ -335,7 +336,7 @@ OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == 0); fprintf(stderr, "- late response gets discarded\n"); - OSMO_ASSERT(reply_to(trans_id, 200, "OK", 1, "v=0\r\n") == -ENOENT); + OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\n\nv=0\r\n") == -ENOENT); fprintf(stderr, "- canceling again does nothing\n"); OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == -ENOENT); -- To view, visit https://gerrit.osmocom.org/10746 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: Ib2e718dda3aa1f6e9979dee823d973dd002e2318 Gerrit-Change-Number: 10746 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 Thu Sep 6 13:42:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: use "\r\n\r\n" instead of "\n\n" In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10747 ) Change subject: mgcp_client_test: use "\r\n\r\n" instead of "\n\n" ...................................................................... mgcp_client_test: use "\r\n\r\n" instead of "\n\n" The separator between MGCP and SDP section is typically "\r\n\r\n". For some reason the test so far used "\n\n" instead, rather use the standard separator. Change-Id: I41c73722e5fae00663bcf96de0b57b7155809a06 --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 84ba3b4..4e7e0a7 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -149,7 +149,7 @@ trans_id = dummy_mgcp_send(msg); reply_to(trans_id, 200, "OK", - "I: 1\n\n" + "I: 1\r\n\r\n" "v=0\r\n" "o=- 1 23 IN IP4 10.9.1.120\r\n" "s=-\r\n" @@ -336,7 +336,7 @@ OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == 0); fprintf(stderr, "- late response gets discarded\n"); - OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\n\nv=0\r\n") == -ENOENT); + OSMO_ASSERT(reply_to(trans_id, 200, "OK", "I: 1\r\n\r\nv=0\r\n") == -ENOENT); fprintf(stderr, "- canceling again does nothing\n"); OSMO_ASSERT(mgcp_client_cancel(mgcp, trans_id) == -ENOENT); diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 58c4b82..4b1e78c 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -11,8 +11,8 @@ composed response: ----- 200 1 OK -I: 1 - +I: 1 + v=0 o=- 1 23 IN IP4 10.9.1.120 s=- @@ -141,8 +141,8 @@ composed response: ----- 200 1 OK -I: 1 - +I: 1 + v=0 ----- -- To view, visit https://gerrit.osmocom.org/10747 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: I41c73722e5fae00663bcf96de0b57b7155809a06 Gerrit-Change-Number: 10747 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 Thu Sep 6 13:42:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: also verify received conn_id In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10748 ) Change subject: mgcp_client_test: also verify received conn_id ...................................................................... mgcp_client_test: also verify received conn_id Include the parsed conn_id in the response cb printout to verify them in mgcp_client_test.ok. Change-Id: I6b9b18d4d0867febd75a4d29f8a2fcdf0553ae4c --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 4e7e0a7..74ed53e 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -102,6 +102,7 @@ printf("response cb received:\n"); printf(" head.response_code = %d\n", response->head.response_code); printf(" head.trans_id = %u\n", response->head.trans_id); + printf(" head.conn_id = %s\n", response->head.conn_id); printf(" head.comment = %s\n", response->head.comment); printf(" audio_port = %u\n", response->audio_port); printf(" audio_ip = %s\n", response->audio_ip); diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 4b1e78c..5e14219 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -27,6 +27,7 @@ response cb received: head.response_code = 200 head.trans_id = 1 + head.conn_id = 1 head.comment = OK audio_port = 16002 audio_ip = 10.9.1.120 -- To view, visit https://gerrit.osmocom.org/10748 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: I6b9b18d4d0867febd75a4d29f8a2fcdf0553ae4c Gerrit-Change-Number: 10748 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 Thu Sep 6 13:42:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_test: test long conn_id In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10749 ) Change subject: mgcp_client_test: test long conn_id ...................................................................... mgcp_client_test: test long conn_id Add a full length (32 characters according to spec) conn ID in a CRCX response, as well as a too long one. The too long one is currently silently truncated, a subsequent patch will improve on that (If2a1aab1f13e771a6705c430e3c75bd42477a23b). Change-Id: I5f2d52f086ea2d330fcce88a176488ace972bf79 --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 2 files changed, 140 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 74ed53e..e6982e4 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -162,6 +162,60 @@ "a=ptime:20\r\n"); } +void test_crcx_long_conn_id(void) +{ + struct msgb *msg; + mgcp_trans_id_t trans_id; + + printf("\n===== %s =====\n", __func__); + + if (mgcp) + talloc_free(mgcp); + mgcp = mgcp_client_init(ctx, &conf); + + msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); + trans_id = dummy_mgcp_send(msg); + + reply_to(trans_id, 200, "OK", + "I: 123456789abcdef0123456789ABCDEF0\r\n\r\n" + "v=0\r\n" + "o=- 1 23 IN IP4 10.9.1.120\r\n" + "s=-\r\n" + "c=IN IP4 10.9.1.120\r\n" + "t=0 0\r\n" + "m=audio 16002 RTP/AVP 110 96\r\n" + "a=rtpmap:110 AMR/8000\r\n" + "a=rtpmap:96 GSM-EFR/8000\r\n" + "a=ptime:20\r\n"); +} + +void test_crcx_too_long_conn_id(void) +{ + struct msgb *msg; + mgcp_trans_id_t trans_id; + + printf("\n===== %s =====\n", __func__); + + if (mgcp) + talloc_free(mgcp); + mgcp = mgcp_client_init(ctx, &conf); + + msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); + trans_id = dummy_mgcp_send(msg); + + reply_to(trans_id, 200, "OK", + "I: 123456789abcdef0123456789ABCDEF01001029\r\n\r\n" + "v=0\r\n" + "o=- 1 23 IN IP4 10.9.1.120\r\n" + "s=-\r\n" + "c=IN IP4 10.9.1.120\r\n" + "t=0 0\r\n" + "m=audio 16002 RTP/AVP 110 96\r\n" + "a=rtpmap:110 AMR/8000\r\n" + "a=rtpmap:96 GSM-EFR/8000\r\n" + "a=ptime:20\r\n"); +} + void test_mgcp_msg(void) { struct msgb *msg; @@ -570,6 +624,8 @@ test_sdp_section_start(); test_map_codec_to_pt_and_map_pt_to_codec(); test_map_pt_to_codec(); + test_crcx_long_conn_id(); + test_crcx_too_long_conn_id(); printf("Done\n"); fprintf(stderr, "Done\n"); diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 5e14219..aedb247 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -196,4 +196,88 @@ 2 <= 2 100 <= 100 + +===== test_crcx_long_conn_id ===== +composed: +----- +CRCX 1 17 at mgw MGCP 1.0 +C: 2a +L: p:20, a:AMR, nt:IN +M: loopback + +----- +composed response: +----- +200 1 OK +I: 123456789abcdef0123456789ABCDEF0 + +v=0 +o=- 1 23 IN IP4 10.9.1.120 +s=- +c=IN IP4 10.9.1.120 +t=0 0 +m=audio 16002 RTP/AVP 110 96 +a=rtpmap:110 AMR/8000 +a=rtpmap:96 GSM-EFR/8000 +a=ptime:20 + +----- +response cb received: + head.response_code = 200 + head.trans_id = 1 + head.conn_id = 123456789abcdef0123456789ABCDEF0 + head.comment = OK + audio_port = 16002 + audio_ip = 10.9.1.120 + ptime = 20 + codecs_len = 2 + codecs[0] = 112 + codecs[1] = 110 + ptmap_len = 2 + ptmap[0].codec = 112 + ptmap[0].pt = 110 + ptmap[1].codec = 110 + ptmap[1].pt = 96 + +===== test_crcx_too_long_conn_id ===== +composed: +----- +CRCX 1 17 at mgw MGCP 1.0 +C: 2a +L: p:20, a:AMR, nt:IN +M: loopback + +----- +composed response: +----- +200 1 OK +I: 123456789abcdef0123456789ABCDEF01001029 + +v=0 +o=- 1 23 IN IP4 10.9.1.120 +s=- +c=IN IP4 10.9.1.120 +t=0 0 +m=audio 16002 RTP/AVP 110 96 +a=rtpmap:110 AMR/8000 +a=rtpmap:96 GSM-EFR/8000 +a=ptime:20 + +----- +response cb received: + head.response_code = 200 + head.trans_id = 1 + head.conn_id = 123456789abcdef0123456789ABCDEF0 + head.comment = OK + audio_port = 16002 + audio_ip = 10.9.1.120 + ptime = 20 + codecs_len = 2 + codecs[0] = 112 + codecs[1] = 110 + ptmap_len = 2 + ptmap[0].codec = 112 + ptmap[0].pt = 110 + ptmap[1].codec = 110 + ptmap[1].pt = 96 Done -- To view, visit https://gerrit.osmocom.org/10749 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: I5f2d52f086ea2d330fcce88a176488ace972bf79 Gerrit-Change-Number: 10749 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 Thu Sep 6 13:42:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: error on too long conn id In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10750 ) Change subject: mgcp_client: error on too long conn id ...................................................................... mgcp_client: error on too long conn id Instead of just silently truncating the conn ID if it is too long, rather verify its length and return an error where applicable. Adjust expected test output. Change-Id: If2a1aab1f13e771a6705c430e3c75bd42477a23b --- M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.err M tests/mgcp_client/mgcp_client_test.ok 3 files changed, 11 insertions(+), 17 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 e9d7b3f..2a8cc15 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -550,6 +550,7 @@ char label, const char *line) { char label_string[4]; + size_t rc; /* Detect empty parameters */ if (strlen(line) < 4) @@ -562,7 +563,14 @@ /* Copy payload part of the string to destinations (the label string * is always 3 chars long) */ - osmo_strlcpy(result, line + 3, result_len); + rc = osmo_strlcpy(result, line + 3, result_len); + if (rc >= result_len) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse MGCP response (parameter label: %c):" + " the received conn ID is too long: %zu, maximum is %u characters\n", + label, rc, result_len - 1); + return -ENOSPC; + } return 0; response_parse_failure: diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index 1d5a1a0..b20f93f 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -66,4 +66,6 @@ DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 +DLMGCP Failed to parse MGCP response (parameter label: I): the received conn ID is too long: 39, maximum is 32 characters +DLMGCP Cannot parse MGCP response (head parameters) Done diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index aedb247..40e32ba 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -264,20 +264,4 @@ a=ptime:20 ----- -response cb received: - head.response_code = 200 - head.trans_id = 1 - head.conn_id = 123456789abcdef0123456789ABCDEF0 - head.comment = OK - audio_port = 16002 - audio_ip = 10.9.1.120 - ptime = 20 - codecs_len = 2 - codecs[0] = 112 - codecs[1] = 110 - ptmap_len = 2 - ptmap[0].codec = 112 - ptmap[0].pt = 110 - ptmap[1].codec = 110 - ptmap[1].pt = 96 Done -- To view, visit https://gerrit.osmocom.org/10750 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: If2a1aab1f13e771a6705c430e3c75bd42477a23b Gerrit-Change-Number: 10750 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 Thu Sep 6 13:42:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_common: rename to MGCP_CONN_ID_MAXLEN In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10751 ) Change subject: mgcp_common: rename to MGCP_CONN_ID_MAXLEN ...................................................................... mgcp_common: rename to MGCP_CONN_ID_MAXLEN So far, MGCP_CONN_ID_LENGTH was often used as exactly the length of the Connection Identifier. To indicate this length as a maximum, introduce the MGCP_CONN_ID_MAXLEN and use it everywhere. Keep the old name as an alias. Change-Id: I1117003c7614e98535d5c201d002e459c01bdc3f --- M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_internal.h M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client_fsm.c M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_msg.c 6 files changed, 11 insertions(+), 8 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 b2c7370..a658f1c 100644 --- a/include/osmocom/mgcp/mgcp_common.h +++ b/include/osmocom/mgcp/mgcp_common.h @@ -79,9 +79,12 @@ /* Maximum length of the comment field */ #define MGCP_COMMENT_MAXLEN 256 -/* String length of Connection Identifiers - * (see also RFC3435 2.1.3.2 Names of Connections) */ -#define MGCP_CONN_ID_LENGTH 32+1 +/* Maximum allowed String length of Connection Identifiers as per spec + * (see also RFC3435 2.1.3.2 Names of Connections), plus one for '\0'. */ +#define MGCP_CONN_ID_MAXLEN 32+1 + +/* Deprecated: old name of MGCP_CONN_ID_MAXLEN. */ +#define MGCP_CONN_ID_LENGTH MGCP_CONN_ID_MAXLEN /* String length of Endpoint Identifiers. / (see also RFC3435 section 3.2.1.3) */ diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 06883dd..f75ae8b 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -226,7 +226,7 @@ enum mgcp_connection_mode mode_orig; /*! connection id to identify the connection */ - char id[MGCP_CONN_ID_LENGTH]; + char id[MGCP_CONN_ID_MAXLEN]; /*! human readable name (vty, logging) */ char name[256]; diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 6c478e8..79f2078 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -60,7 +60,7 @@ int response_code; mgcp_trans_id_t trans_id; char comment[MGCP_COMMENT_MAXLEN]; - char conn_id[MGCP_CONN_ID_LENGTH]; + char conn_id[MGCP_CONN_ID_MAXLEN]; char endpoint[MGCP_ENDPOINT_MAXLEN]; }; diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 5368ec3..da900c5 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -41,7 +41,7 @@ bool mgw_trans_pending; /* Connection ID which has been assigned by he MGW */ - char conn_id[MGCP_CONN_ID_LENGTH]; + char conn_id[MGCP_CONN_ID_MAXLEN]; /* Local RTP connection info, the MGW will send outgoing traffic to the * ip/port specified here. The Address does not have to be choosen right diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 3a5db0f..2a45b81 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -78,7 +78,7 @@ /* ensure that the generated conn_id is unique * for this endpoint */ if (!mgcp_conn_get_rtp(endp, id_hex)) { - osmo_strlcpy(id, id_hex, MGCP_CONN_ID_LENGTH); + osmo_strlcpy(id, id_hex, MGCP_CONN_ID_MAXLEN); return 0; } } diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a7c8b47..49d0380 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -450,7 +450,7 @@ } /* Check for over long connection identifiers */ - if (strlen(conn_id) > MGCP_CONN_ID_LENGTH) { + if (strlen(conn_id) > MGCP_CONN_ID_MAXLEN) { LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n", ENDPOINT_NUMBER(endp), conn_id); -- To view, visit https://gerrit.osmocom.org/10751 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: I1117003c7614e98535d5c201d002e459c01bdc3f Gerrit-Change-Number: 10751 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 Thu Sep 6 13:42:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:45 +0000 Subject: Change in osmo-mgw[master]: doc: fix mgcp_verify_ci() return val doc In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10752 ) Change subject: doc: fix mgcp_verify_ci() return val doc ...................................................................... doc: fix mgcp_verify_ci() return val doc Match the '\returns' doc to the actual implementation. Change-Id: I6f89abd56ffcda8ba0276db1bc3381fa372e35a4 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 49d0380..c4e66ff 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -430,7 +430,8 @@ /*! Check if the specified connection id seems plausible. * \param[in] endp pointer to endpoint * \param{in] connection id to verify - * \returns 1 when connection id seems plausible, 0 on error */ + * \returns 0 when connection id is valid and exists, nozero on error. + */ int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id) { /* Check for null identifiers */ -- To view, visit https://gerrit.osmocom.org/10752 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: I6f89abd56ffcda8ba0276db1bc3381fa372e35a4 Gerrit-Change-Number: 10752 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 Thu Sep 6 13:42:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:46 +0000 Subject: Change in osmo-mgw[master]: mgcp_verify_ci(): return meaningful error codes In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10753 ) Change subject: mgcp_verify_ci(): return meaningful error codes ...................................................................... mgcp_verify_ci(): return meaningful error codes Instead of just -1, return RFC3435 error codes that can be used to compose a FAIL message response. Note that the return value stays compatible in that it returns 0 on a valid Connection Identifier, nonzero otherwise. The idea is to be able to distinguish between "Conn ID not found" and "Conn ID invalid" in mgcp_test.c's expected output, in upcoming change I8d6cc96be252bb486e94f343a8c7cae641ff9429. Change-Id: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6 --- M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 12 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index c4e66ff..f732158 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -430,16 +430,19 @@ /*! Check if the specified connection id seems plausible. * \param[in] endp pointer to endpoint * \param{in] connection id to verify - * \returns 0 when connection id is valid and exists, nozero on error. + * \returns 0 when connection id is valid and exists, an RFC3435 error code on error. */ int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id) { + /* For invalid conn_ids, return 510 "The transaction could not be executed, because some + * unspecified protocol error was detected." */ + /* Check for null identifiers */ if (!conn_id) { LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (missing)\n", ENDPOINT_NUMBER(endp)); - return -1; + return 510; } /* Check for empty connection identifiers */ @@ -447,7 +450,7 @@ LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (empty)\n", ENDPOINT_NUMBER(endp)); - return -1; + return 510; } /* Check for over long connection identifiers */ @@ -455,7 +458,7 @@ LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n", ENDPOINT_NUMBER(endp), conn_id); - return -1; + return 510; } /* Check if connection exists */ @@ -466,7 +469,9 @@ "endpoint:0x%x no connection found under ConnectionIdentifier 0x%s\n", ENDPOINT_NUMBER(endp), conn_id); - return -1; + /* When the conn_id was not found, return error code 515 "The transaction refers to an incorrect + * connection-id (may have been already deleted)." */ + return 515; } /*! Extract individual lines from MCGP message. diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 7f4a7b8..bc191b5 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -999,10 +999,8 @@ break; case 'I': conn_id = (const char *)line + 3; - if (mgcp_verify_ci(endp, conn_id) != 0) { - error_code = 515; + if ((error_code = mgcp_verify_ci(endp, conn_id))) goto error3; - } break; case 'L': local_options = (const char *)line + 3; @@ -1185,10 +1183,8 @@ break; case 'I': conn_id = (const char *)line + 3; - if (mgcp_verify_ci(endp, conn_id) != 0) { - error_code = 515; + if ((error_code = mgcp_verify_ci(endp, conn_id))) goto error3; - } break; case 'Z': silent = strcmp("noanswer", line + 3) == 0; -- To view, visit https://gerrit.osmocom.org/10753 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: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6 Gerrit-Change-Number: 10753 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 Thu Sep 6 13:42:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:46 +0000 Subject: Change in osmo-mgw[master]: fix mgcp_verify_ci(): off-by-one in max len check In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10754 ) Change subject: fix mgcp_verify_ci(): off-by-one in max len check ...................................................................... fix mgcp_verify_ci(): off-by-one in max len check MGCP_CONN_ID_MAXLEN actually includes a terminating nul, so we need to compare strlen() against MGCP_CONN_ID_MAXLEN-1. Log the length if it is too long. Add MDCX_TOO_LONG_CI test to mgcp_test.c, testing a conn id of 33 characters. Before this patch, the test returns error code 515 meaning "not found", while now it returns 510 meaning "invalid", showing the off-by-one. Same is illustrated by the error log ("not found" before, "too long" now), but the error log is not verified by mgcp_test.c. Change-Id: I8d6cc96be252bb486e94f343a8c7cae641ff9429 --- M src/libosmo-mgcp/mgcp_msg.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 23 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index f732158..648d86b 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -454,10 +454,10 @@ } /* Check for over long connection identifiers */ - if (strlen(conn_id) > MGCP_CONN_ID_MAXLEN) { + if (strlen(conn_id) > (MGCP_CONN_ID_MAXLEN-1)) { LOGP(DLMGCP, LOGL_ERROR, - "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n", - ENDPOINT_NUMBER(endp), conn_id); + "endpoint:0x%x invalid ConnectionIdentifier (too long: %zu > %d) 0x%s\n", + ENDPOINT_NUMBER(endp), strlen(conn_id), MGCP_CONN_ID_MAXLEN-1, conn_id); return 510; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2f3a8a7..c40eabc 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -230,6 +230,12 @@ "I: %s\r\n" \ "L: p:20, a:AMR, nt:IN\r\n" +#define MDCX_TOO_LONG_CI \ + "MDCX 18983222 1 at mgw MGCP 1.0\r\n" \ + "I: 123456789012345678901234567890123\n" + +#define MDCX_TOO_LONG_CI_RET "510 18983222 FAIL\r\n" + #define SHORT2 "CRCX 1" #define SHORT2_RET "510 000000 FAIL\r\n" #define SHORT3 "CRCX 1 1 at mgw" @@ -510,6 +516,7 @@ {"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}, + {"MDCX_TOO_LONG_CI", MDCX_TOO_LONG_CI, MDCX_TOO_LONG_CI_RET}, }; static const struct mgcp_test retransmit[] = { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 915d45e..ddda751 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -443,6 +443,19 @@ Dummy packets: 2 ================================================ +Testing MDCX_TOO_LONG_CI +creating message from statically defined input: +---------8<--------- +MDCX 18983222 1 at mgw MGCP 1.0 +I: 123456789012345678901234567890123 + +---------8<--------- +checking response: +using message as statically defined for comparison +Response matches our expectations. +(response does not contain a connection id) + +================================================ Testing CRCX creating message from statically defined input: ---------8<--------- -- To view, visit https://gerrit.osmocom.org/10754 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: I8d6cc96be252bb486e94f343a8c7cae641ff9429 Gerrit-Change-Number: 10754 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 Thu Sep 6 13:42:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 13:42:47 +0000 Subject: Change in osmo-mgw[master]: generate shorter 'I:' conn IDs In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( 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. Notice that the maximum length of conn ID that can be handled by the message parsing and composition doesn't change, only the length that an osmo-mgw will generate upon CRCX does. Related: OS#3507 Change-Id: Ia290c22a91fca0e5aa44515fca6df00064aff100 --- M src/libosmo-mgcp/mgcp_conn.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 2a45b81..0126c7c 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -55,10 +55,11 @@ * memory for id) */ static int mgcp_alloc_id(struct mgcp_endpoint *endp, char *id) { +#define MGCP_CONN_ID_GEN_LEN 8 int i; int k; int rc; - uint8_t id_bin[16]; + uint8_t id_bin[MGCP_CONN_ID_GEN_LEN / 2]; 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: merged Gerrit-Change-Id: Ia290c22a91fca0e5aa44515fca6df00064aff100 Gerrit-Change-Number: 10676 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 Thu Sep 6 13:57:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:57:11 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... Patch Set 1: I would prefer if it somehow indicated that thisis the destination ip address or host name. "gsmtap host" doesn't really imply whether it's the local (bind) or the remote (connect) address. -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Sep 2018 13:57:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:57:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:57:49 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10773 ) Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13: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 Thu Sep 6 13:57:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:57:50 +0000 Subject: Change in docker-playground[master]: Fix "'laforge/debian-jessie-build' not found" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10773 ) Change subject: Fix "'laforge/debian-jessie-build' not found" ...................................................................... Fix "'laforge/debian-jessie-build' not found" Instead of hardcoding laforge's username in all FROM statements in the Dockerfiles, make use of the USER variable (as passed through by the "make/Makefile" with "docker build --build-arg USER=..."). Thanks to fixeria for proposing this fix! This requires running docker-ce, old versions of docker (such as the one in the official repositories of the latest Fedora) don't support variables in the FROM line. But docker-ce can be installed after adding docker's 3rd party repositories. Closes: OS#3457 Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f --- M debian-jessie-buildslave-st/Dockerfile M debian-jessie-buildslave/Dockerfile M osmo-bsc-master/Dockerfile M osmo-bts-master/Dockerfile M osmo-gerrit-libosmo/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-mgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-nitb-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmocom-bb-host-master/Dockerfile M sctp-test/Dockerfile M sigtran-tests/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile 26 files changed, 52 insertions(+), 26 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Harald Welte: Verified diff --git a/debian-jessie-buildslave-st/Dockerfile b/debian-jessie-buildslave-st/Dockerfile index 0f1b435..2d2c985 100644 --- a/debian-jessie-buildslave-st/Dockerfile +++ b/debian-jessie-buildslave-st/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-buildslave +ARG USER +FROM $USER/debian-jessie-buildslave RUN apt-get -y install \ libffi-dev \ diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile index 70eab38..158e19e 100644 --- a/debian-jessie-buildslave/Dockerfile +++ b/debian-jessie-buildslave/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index c36fe66..5c76688 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 3c2dbec..69a8d4c 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile index ac89bbe..5442703 100644 --- a/osmo-gerrit-libosmo/Dockerfile +++ b/osmo-gerrit-libosmo/Dockerfile @@ -3,7 +3,8 @@ # projects, and then simply 'git pull' + build the given project # that we want to compile-test at 'docker run' time (in tmpfs) -FROM laforge/debian-jessie-buildslave +ARG USER +FROM $USER/debian-jessie-buildslave MAINTAINER Harald Welte diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index dd9f07a..5acdf98 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index 68c3b43..45c3bd5 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 4c60917..c00d68b 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 9dc2813..2c9469e 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 3ecbb2a..fe40d78 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index f7648a7..94563b1 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 738987a..841e324 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 55a984c..e69cbc7 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 7c11d91..ae93c10 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 19cc772..0cede4b 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index b39a459..fe5db70 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile index 452e169..b09fa09 100644 --- a/sigtran-tests/Dockerfile +++ b/sigtran-tests/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 9bdc898..29a121a 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 3fec55b..1f5b47c 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 4e5e2da..5ca917b 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 0dee3d3..afa17fc 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 6460c0a..e2327b7 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index bbc60a2..f812ee0 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 8cd9e58..a50a434 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index d06195d..038a765 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 7d566b9..d7ea0db 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git -- To view, visit https://gerrit.osmocom.org/10773 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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f Gerrit-Change-Number: 10773 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:58:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:58:18 +0000 Subject: Change in osmo-sgsn[master]: Add osmo-gtphub systemd service file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10806 ) Change subject: Add osmo-gtphub systemd service file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10806 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: I7ecfc9aa55611ae9975e5ef8c0716dae7598524c Gerrit-Change-Number: 10806 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 13:58:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 13:58:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:58:19 +0000 Subject: Change in osmo-sgsn[master]: Add osmo-gtphub systemd service file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10806 ) Change subject: Add osmo-gtphub systemd service file ...................................................................... Add osmo-gtphub systemd service file Change-Id: I7ecfc9aa55611ae9975e5ef8c0716dae7598524c --- A contrib/systemd/osmo-gtphub.service A debian/osmo-gtphub.service 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/systemd/osmo-gtphub.service b/contrib/systemd/osmo-gtphub.service new file mode 100644 index 0000000..4881785 --- /dev/null +++ b/contrib/systemd/osmo-gtphub.service @@ -0,0 +1,12 @@ +[Unit] +Description=Osmocom GTP Hub + +[Service] +Type=simple +ExecStart=/usr/bin/osmo-gtphub -c /etc/osmocom/osmo-gtphub.cfg +Restart=always +RestartSec=2 +RestartPreventExitStatus=1 + +[Install] +WantedBy=multi-user.target diff --git a/debian/osmo-gtphub.service b/debian/osmo-gtphub.service new file mode 120000 index 0000000..81a0eb4 --- /dev/null +++ b/debian/osmo-gtphub.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-gtphub.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10806 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: I7ecfc9aa55611ae9975e5ef8c0716dae7598524c Gerrit-Change-Number: 10806 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 Sep 6 13:58:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:58:40 +0000 Subject: Change in osmo-sip-connector[master]: debian: Use osmo-sip-connector.service from contrib In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10807 ) Change subject: debian: Use osmo-sip-connector.service from contrib ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10807 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: I556a91e012692c4073b4b832bccce0c850f684f8 Gerrit-Change-Number: 10807 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 13:58: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 Sep 6 13:58:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:58:41 +0000 Subject: Change in osmo-sip-connector[master]: debian: Use osmo-sip-connector.service from contrib In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10807 ) Change subject: debian: Use osmo-sip-connector.service from contrib ...................................................................... debian: Use osmo-sip-connector.service from contrib Use a symlink to avoid duplicating content. Remove nonsense Wants= line on itself. Change-Id: I556a91e012692c4073b4b832bccce0c850f684f8 --- M contrib/systemd/osmo-sip-connector.service D debian/osmo-sip-connector.service A debian/osmo-sip-connector.service 3 files changed, 1 insertion(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/systemd/osmo-sip-connector.service b/contrib/systemd/osmo-sip-connector.service index e44ab9b..a08f167 100644 --- a/contrib/systemd/osmo-sip-connector.service +++ b/contrib/systemd/osmo-sip-connector.service @@ -1,6 +1,5 @@ [Unit] Description=Osmo SIP Connector -Wants=osmo-sip-connector.service [Service] Type=simple diff --git a/debian/osmo-sip-connector.service b/debian/osmo-sip-connector.service deleted file mode 100644 index 6694a17..0000000 --- a/debian/osmo-sip-connector.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Osmocom osmo-sip-connector - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-sip-connector -c /etc/osmocom/osmo-sip-connector.cfg -Restart=always -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/debian/osmo-sip-connector.service b/debian/osmo-sip-connector.service new file mode 120000 index 0000000..c0ae1e1 --- /dev/null +++ b/debian/osmo-sip-connector.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-sip-connector.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10807 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: I556a91e012692c4073b4b832bccce0c850f684f8 Gerrit-Change-Number: 10807 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 Sep 6 13:58:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 13:58:55 +0000 Subject: Change in osmocom-bb[master]: osmocon: Add --enable-{werror, sanitize} configure flags In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10801 ) Change subject: osmocon: Add --enable-{werror,sanitize} configure flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10801 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: I6a69ca514406fa18684ca2621be45f87ee8d64a4 Gerrit-Change-Number: 10801 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 13:58:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:03:11 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Sep 2018 14:03:11 +0000 Subject: Change in osmo-bts[master]: measurement: send measurement reports for missed interval ends In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/10761 ) Change subject: measurement: send measurement reports for missed interval ends ...................................................................... Abandoned This is part of a misguided approach. Unfortunately we have to abandon this. -- To view, visit https://gerrit.osmocom.org/10761 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: Ia6d20136832714e3d439ddf9abaea0f66898bb61 Gerrit-Change-Number: 10761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:03:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:03:40 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_sock_unix_init_ofd() 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/10805 to look at the new patch set (#2). Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... layer23: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I57c724c78dbbbce0546ebe914e370f32c8c89703 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/mncc_sock.c 3 files changed, 11 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/10805/2 -- To view, visit https://gerrit.osmocom.org/10805 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: I57c724c78dbbbce0546ebe914e370f32c8c89703 Gerrit-Change-Number: 10805 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:03:43 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Sep 2018 14:03:43 +0000 Subject: Change in osmo-bts[master]: measurement: fix SACCH interval remapping in test_is_meas_overdue() In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/10760 ) Change subject: measurement: fix SACCH interval remapping in test_is_meas_overdue() ...................................................................... Abandoned This is part of a misguided approach. Unfortunately we have to abandon this. -- To view, visit https://gerrit.osmocom.org/10760 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: Idf6db73f67b7273c3d5965616c9e78f66b74a406 Gerrit-Change-Number: 10760 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:13:41 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 6 Sep 2018 14:13:41 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10782 ) Change subject: grgsm_trx: Migrated argument parsing to argparse ...................................................................... grgsm_trx: Migrated argument parsing to argparse Argparse makes adding new parameters easier and adds consistent way of handling default values of parameters and printing of their help info. Change-Id: Idf99fd7a581464aa2f77fe01e721dbd162686811 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 280 insertions(+), 300 deletions(-) Objections: Vadim Yanitskiy: I would prefer this is not merged as is diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 45312e6..712b0b7 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -4,6 +4,7 @@ # GR-GSM based transceiver # # (C) 2016-2018 by Vadim Yanitskiy +# (C) 2017-2018 by Piotr Krysik # # All Rights Reserved # @@ -30,34 +31,40 @@ from grgsm.trx import ctrl_if_bb from grgsm.trx import radio_if from grgsm.trx import fake_pm +from argparse import ArgumentParser COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ - "Copyright (C) 2017 by Piotr Krysik \n" \ + "Copyright (C) 2017-2018 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" \ "There is NO WARRANTY, to the extent permitted by law.\n" -class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 6700 - - # PHY specific - phy_sample_rate = 4 * 1625000 / 6 - phy_freq_offset_hz = None - phy_tx_antenna = "TX/RX" - phy_rx_antenna = "RX2" - phy_rx_gain = 30 - phy_tx_gain = 10 - phy_args = "" - phy_ppm = 0 - - def __init__(self): - self.print_copyright() - self.parse_argv() +class grgsm_trx: + def __init__(self, + remote_addr, + bind_addr, + base_port, + args, + sample_rate, + rx_gain, + tx_gain, + rx_antenna, + tx_antenna, + freq_offset, + ppm): + self.remote_addr = remote_addr + self.bind_addr = bind_addr + self.base_port = base_port + self.phy_args = args + self.phy_sample_rate = sample_rate + self.phy_rx_gain = rx_gain + self.phy_tx_gain = tx_gain + self.phy_rx_antenna = rx_antenna + self.phy_tx_antenna = tx_antenna + self.phy_freq_offset = freq_offset + self.phy_ppm = ppm # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -66,14 +73,10 @@ # Init Radio interface 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.phy_rx_antenna, self.phy_tx_antenna, self.phy_freq_offset, self.bind_addr, self.remote_addr, self.base_port) - # Optional frequency offset - if self.phy_freq_offset_hz is not None: - self.radio.freq_offset_hz = self.phy_freq_offset_hz - # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 @@ -95,97 +98,73 @@ print("[i] Shutting down...") self.radio.shutdown() - def print_copyright(self): - print(COPYRIGHT) - - def print_help(self): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - # 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 - 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 %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" \ - " --freq-offset Shift baseband freq. (e.g. -500M)\n" \ - " --ppm Set frequency correction (default %d)\n" - - print(s % ( - self.remote_addr, - self.bind_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: - opts, args = getopt.getopt(sys.argv[1:], - "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=", "freq-offset="]) - except getopt.GetoptError as err: - # Print(help and exit) - self.print_help() - print("[!] " + str(err)) - sys.exit(2) - - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) - - # 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) - else: - print("[!] The port number should be in range [0-65536]") - sys.exit(2) - - # PHY specific - elif o in ("-a", "--device-args"): - self.phy_args = v - elif o in ("-s", "--sample-rate"): - self.phy_sample_rate = int(v) - elif o in ("-g", "--rx-gain"): - self.phy_rx_gain = int(v) - elif o in ("-G", "--tx-gain"): - self.phy_tx_gain = int(v) - elif o in ("--rx-antenna"): - self.phy_rx_antenna = v - elif o in ("--tx-antenna"): - self.phy_tx_antenna = v - elif o in ("--ppm"): - self.phy_ppm = int(v) - elif o in ("--freq-offset"): - # Convert /\d+(\.\d+)?(M|k)?/ to Hz - offset_hz = eng_notation.str_to_num(v) - self.phy_freq_offset_hz = offset_hz - def sig_handler(self, signum, frame): print("Signal %d received" % signum) if signum is signal.SIGINT: self.shutdown() sys.exit(0) -if __name__ == '__main__': - app = Application() +def parse_args(): + description = 'Burst transceiver for GSM Mobile Station' + parser = ArgumentParser(prog="grgsm_trx", usage='%(prog)s [options]', + description=description) + # TRX specific + parser.add_argument("-i", "--remote-addr", dest="remote_addr", type=str, + default='127.0.0.1', + help="Set remote address default=%(default)s") + parser.add_argument("-b", "--bind-addr", dest="bind_addr", type=str, + default='0.0.0.0', + help="Set bind address default=%(default)s") + parser.add_argument( + "-p", "--base_port", dest="base_port", type=int, + default=6700, + help="Set base port number default=%(default)s") + + # PHY specific + parser.add_argument("-a", "--args", dest="args", type=str, + default="", + help="Set Device Arguments default=%(default)s") + parser.add_argument("-s", "--sample-rate", dest="sample_rate", type=float, + default=1083333.3333333333, + help="Set samp_rate default=%(default)s") + parser.add_argument("-g", "--rx-gain", dest="rx_gain", type=float, + default=30, + help="Set RX gain default=%(default)s") + parser.add_argument("-G", "--tx-gain", dest="tx_gain", type=float, + default=10, + help="Set TX gain default=%(default)s") + parser.add_argument("--rx-antenna", dest="rx_antenna", type=str, + default="RX2", + help="Set RX antenna") + parser.add_argument("--tx-antenna", dest="tx_antenna", type=str, + default='TX/RX', + help="Set TX antenna default=%(default)s") + parser.add_argument( + "--freq-offset", dest="freq_offset", type=float, + default=0, + help="Shift Tx and Rx frequencies default=%(default)s") + parser.add_argument("--ppm", dest="ppm", type=float, + default=0, + help="Set ppm default=%(default)s") + + return parser.parse_args() + +def main(): + print(COPYRIGHT) + options = parse_args() + app = grgsm_trx( + remote_addr=options.remote_addr, + bind_addr=options.bind_addr, + base_port=options.base_port, + args=options.args, + sample_rate=options.sample_rate, + rx_gain=options.rx_gain, + tx_gain=options.tx_gain, + rx_antenna=options.rx_antenna, + tx_antenna=options.tx_antenna, + freq_offset=options.freq_offset, + ppm=options.ppm) app.run() + +if __name__ == '__main__': + main() diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 407e724..17a0d00 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -59,251 +59,252 @@ self.message_port_pub(pmt.intern("dict_out"), pmt.to_pmt(d)) class radio_if(gr.top_block): - # PHY specific variables - freq_offset_hz = None - rx_freq = 935e6 - tx_freq = 890e6 - osr = 4 + # PHY specific variables + rx_freq = 935e6 + tx_freq = 890e6 + osr = 4 - # Application state flags - trx_started = False + # Application state flags + trx_started = False - # GSM timings (in microseconds [uS]) - # One timeslot duration is 576.9 ?s = 15/26 ms, - # or 156.25 symbol periods (a symbol period is 48/13 ?s) - GSM_SYM_PERIOD_uS = 48.0 / 13.0 - GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 - GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) + # GSM timings (in microseconds [uS]) + # One timeslot duration is 576.9 ?s = 15/26 ms, + # or 156.25 symbol periods (a symbol period is 48/13 ?s) + GSM_SYM_PERIOD_uS = 48.0 / 13.0 + GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 + GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) - # FIXME: shall be measured (automatically?) for - # particular device and particular clock rate. - # The current value is measured for USRP B2X0 at 26e6. - delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6 + # FIXME: shall be measured (automatically?) for + # particular device and particular clock rate. + # The current value is measured for USRP B2X0 at 26e6. + delay_correction = (285.616 + 2 * GSM_SYM_PERIOD_uS) * 1e-6 - def __init__(self, phy_args, phy_sample_rate, - phy_rx_gain, phy_tx_gain, phy_ppm, - phy_rx_antenna, phy_tx_antenna, - trx_bind_addr, trx_remote_addr, - trx_base_port): + def __init__(self, phy_args, phy_sample_rate, + phy_rx_gain, phy_tx_gain, phy_ppm, + phy_rx_antenna, phy_tx_antenna, + phy_freq_offset, + trx_bind_addr, trx_remote_addr, + trx_base_port): - 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)) + 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 - self.rx_gain = phy_rx_gain - self.tx_gain = phy_tx_gain - self.ppm = phy_ppm + # PHY specific variables + self.sample_rate = phy_sample_rate + self.rx_gain = phy_rx_gain + self.tx_gain = phy_tx_gain + self.phy_freq_offset = phy_freq_offset + self.ppm = phy_ppm - gr.top_block.__init__(self, "GR-GSM TRX") + gr.top_block.__init__(self, "GR-GSM TRX") - # TRX Burst Interface - self.trx_burst_if = grgsm.trx_burst_if( - trx_bind_addr, trx_remote_addr, - str(trx_base_port)) + # TRX Burst Interface + self.trx_burst_if = grgsm.trx_burst_if( + trx_bind_addr, trx_remote_addr, + str(trx_base_port)) - # RX path definition - self.phy_src = uhd.usrp_source(phy_args, - uhd.stream_args(cpu_format="fc32", - channels=range(1))) + # RX path definition + self.phy_src = uhd.usrp_source(phy_args, + uhd.stream_args(cpu_format="fc32", + channels=range(1))) - self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_src.set_center_freq(self.rx_freq, 0) - self.phy_src.set_antenna(phy_rx_antenna, 0) - self.phy_src.set_samp_rate(phy_sample_rate) - self.phy_src.set_bandwidth(650e3, 0) - self.phy_src.set_gain(phy_rx_gain) + self.phy_src.set_clock_rate(26e6, uhd.ALL_MBOARDS) + self.phy_src.set_center_freq(self.rx_freq, 0) + self.phy_src.set_antenna(phy_rx_antenna, 0) + self.phy_src.set_samp_rate(phy_sample_rate) + self.phy_src.set_bandwidth(650e3, 0) + self.phy_src.set_gain(phy_rx_gain) - self.msg_to_tag_src = grgsm.msg_to_tag() + self.msg_to_tag_src = grgsm.msg_to_tag() - self.rotator_src = grgsm.controlled_rotator_cc( - self.calc_phase_inc(self.rx_freq)) + self.rotator_src = grgsm.controlled_rotator_cc( + self.calc_phase_inc(self.rx_freq)) - self.lpf = filter.fir_filter_ccf(1, firdes.low_pass( - 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) + self.lpf = filter.fir_filter_ccf(1, firdes.low_pass( + 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) - self.gsm_receiver = grgsm.receiver(self.osr, ([0]), ([])) + self.gsm_receiver = grgsm.receiver(self.osr, ([0]), ([])) - self.ts_filter = grgsm.burst_timeslot_filter(0) - self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) + self.ts_filter = grgsm.burst_timeslot_filter(0) + self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) - # Connections - self.connect( - (self.phy_src, 0), - (self.msg_to_tag_src, 0)) + # Connections + self.connect( + (self.phy_src, 0), + (self.msg_to_tag_src, 0)) - self.connect( - (self.msg_to_tag_src, 0), - (self.rotator_src, 0)) + self.connect( + (self.msg_to_tag_src, 0), + (self.rotator_src, 0)) - self.connect( - (self.rotator_src, 0), - (self.lpf, 0)) + self.connect( + (self.rotator_src, 0), + (self.lpf, 0)) - self.connect( - (self.lpf, 0), - (self.gsm_receiver, 0)) + self.connect( + (self.lpf, 0), + (self.gsm_receiver, 0)) - self.msg_connect( - (self.gsm_receiver, 'C0'), - (self.ts_filter, 'in')) + self.msg_connect( + (self.gsm_receiver, 'C0'), + (self.ts_filter, 'in')) - self.msg_connect( - (self.ts_filter, 'out'), - (self.trx_burst_if, 'bursts')) + self.msg_connect( + (self.ts_filter, 'out'), + (self.trx_burst_if, 'bursts')) - # TX Path Definition - self.phy_sink = uhd.usrp_sink(phy_args, - uhd.stream_args(cpu_format="fc32", - channels=range(1)), "packet_len") + # TX Path Definition + self.phy_sink = uhd.usrp_sink(phy_args, + uhd.stream_args(cpu_format="fc32", + channels=range(1)), "packet_len") - self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) - self.phy_sink.set_antenna(phy_tx_antenna, 0) - self.phy_sink.set_samp_rate(phy_sample_rate) - self.phy_sink.set_center_freq(self.tx_freq, 0) - self.phy_sink.set_gain(self.tx_gain) + self.phy_sink.set_clock_rate(26e6, uhd.ALL_MBOARDS) + self.phy_sink.set_antenna(phy_tx_antenna, 0) + self.phy_sink.set_samp_rate(phy_sample_rate) + self.phy_sink.set_center_freq(self.tx_freq, 0) + self.phy_sink.set_gain(self.tx_gain) - self.tx_time_setter = grgsm.txtime_setter( - 0xffffffff, 0, 0, 0, 0, 0, - self.delay_correction + self.GSM_UL_DL_SHIFT_uS * 1e-6) + self.tx_time_setter = grgsm.txtime_setter( + 0xffffffff, 0, 0, 0, 0, 0, + self.delay_correction + self.GSM_UL_DL_SHIFT_uS * 1e-6) - self.tx_burst_proc = grgsm.preprocess_tx_burst() + self.tx_burst_proc = grgsm.preprocess_tx_burst() - self.pdu_to_tagged_stream = blocks.pdu_to_tagged_stream( - blocks.byte_t, 'packet_len') + self.pdu_to_tagged_stream = blocks.pdu_to_tagged_stream( + blocks.byte_t, 'packet_len') - self.gmsk_mod = grgsm.gsm_gmsk_mod( - BT = 0.3, pulse_duration = 4, sps = self.osr) + self.gmsk_mod = grgsm.gsm_gmsk_mod( + BT = 0.3, pulse_duration = 4, sps = self.osr) - self.burst_shaper = digital.burst_shaper_cc( - (firdes.window(firdes.WIN_HANN, 16, 0)), - 0, 20, False, "packet_len") + self.burst_shaper = digital.burst_shaper_cc( + (firdes.window(firdes.WIN_HANN, 16, 0)), + 0, 20, False, "packet_len") - self.msg_to_tag_sink = grgsm.msg_to_tag() + self.msg_to_tag_sink = grgsm.msg_to_tag() - self.rotator_sink = grgsm.controlled_rotator_cc( - -self.calc_phase_inc(self.tx_freq)) + self.rotator_sink = grgsm.controlled_rotator_cc( + -self.calc_phase_inc(self.tx_freq)) - # Connections - self.msg_connect( - (self.trx_burst_if, 'bursts'), - (self.tx_time_setter, 'bursts_in')) + # Connections + self.msg_connect( + (self.trx_burst_if, 'bursts'), + (self.tx_time_setter, 'bursts_in')) - self.msg_connect( - (self.tx_time_setter, 'bursts_out'), - (self.tx_burst_proc, 'bursts_in')) + self.msg_connect( + (self.tx_time_setter, 'bursts_out'), + (self.tx_burst_proc, 'bursts_in')) - self.msg_connect( - (self.tx_burst_proc, 'bursts_out'), - (self.pdu_to_tagged_stream, 'pdus')) + self.msg_connect( + (self.tx_burst_proc, 'bursts_out'), + (self.pdu_to_tagged_stream, 'pdus')) - self.connect( - (self.pdu_to_tagged_stream, 0), - (self.gmsk_mod, 0)) + self.connect( + (self.pdu_to_tagged_stream, 0), + (self.gmsk_mod, 0)) - self.connect( - (self.gmsk_mod, 0), - (self.burst_shaper, 0)) + self.connect( + (self.gmsk_mod, 0), + (self.burst_shaper, 0)) - self.connect( - (self.burst_shaper, 0), - (self.msg_to_tag_sink, 0)) + self.connect( + (self.burst_shaper, 0), + (self.msg_to_tag_sink, 0)) - self.connect( - (self.msg_to_tag_sink, 0), - (self.rotator_sink, 0)) + self.connect( + (self.msg_to_tag_sink, 0), + (self.rotator_sink, 0)) - self.connect( - (self.rotator_sink, 0), - (self.phy_sink, 0)) + self.connect( + (self.rotator_sink, 0), + (self.phy_sink, 0)) - # RX & TX synchronization - self.bt_filter = grgsm.burst_type_filter([3]) - self.burst_to_fn_time = grgsm.burst_to_fn_time() + # RX & TX synchronization + self.bt_filter = grgsm.burst_type_filter([3]) + self.burst_to_fn_time = grgsm.burst_to_fn_time() - # Connections - self.msg_connect( - (self.gsm_receiver, 'C0'), - (self.bt_filter, 'bursts_in')) + # Connections + self.msg_connect( + (self.gsm_receiver, 'C0'), + (self.bt_filter, 'bursts_in')) - self.msg_connect( - (self.bt_filter, 'bursts_out'), - (self.burst_to_fn_time, 'bursts_in')) + self.msg_connect( + (self.bt_filter, 'bursts_out'), + (self.burst_to_fn_time, 'bursts_in')) - self.msg_connect( - (self.burst_to_fn_time, 'fn_time_out'), - (self.tx_time_setter, 'fn_time')) + self.msg_connect( + (self.burst_to_fn_time, 'fn_time_out'), + (self.tx_time_setter, 'fn_time')) - # AFC (Automatic Frequency Correction) - self.gsm_clck_ctrl = grgsm.clock_offset_control( - self.rx_freq, phy_sample_rate, osr = self.osr) + # AFC (Automatic Frequency Correction) + self.gsm_clck_ctrl = grgsm.clock_offset_control( + self.rx_freq, phy_sample_rate, osr = self.osr) - self.dict_toggle_sign = dict_toggle_sign() + self.dict_toggle_sign = dict_toggle_sign() - # Connections - self.msg_connect( - (self.gsm_receiver, 'measurements'), - (self.gsm_clck_ctrl, 'measurements')) + # Connections + self.msg_connect( + (self.gsm_receiver, 'measurements'), + (self.gsm_clck_ctrl, 'measurements')) - self.msg_connect( - (self.gsm_clck_ctrl, 'ctrl'), - (self.msg_to_tag_src, 'msg')) + self.msg_connect( + (self.gsm_clck_ctrl, 'ctrl'), + (self.msg_to_tag_src, 'msg')) - self.msg_connect( - (self.gsm_clck_ctrl, 'ctrl'), - (self.dict_toggle_sign, 'dict_in')) + self.msg_connect( + (self.gsm_clck_ctrl, 'ctrl'), + (self.dict_toggle_sign, 'dict_in')) - self.msg_connect( - (self.dict_toggle_sign, 'dict_out'), - (self.msg_to_tag_sink, 'msg')) + self.msg_connect( + (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)) + # 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() - self.wait() + def shutdown(self): + print("[i] Shutdown Radio interface") + self.stop() + self.wait() - def calc_phase_inc(self, fc): - return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate + def calc_phase_inc(self, fc): + return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate - def set_rx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting RX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) - self.phy_src.set_center_freq(fc, 0) - self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) - self.rx_freq = fc + def set_rx_freq(self, fc): + if self.phy_freq_offset != 0: + fc += self.phy_freq_offset + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset))) + self.phy_src.set_center_freq(fc, 0) + self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) + self.rx_freq = fc - def set_tx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting TX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) - self.phy_sink.set_center_freq(fc, 0) - self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) - self.tx_freq = fc + def set_tx_freq(self, fc): + if self.phy_freq_offset != 0: + fc += self.phy_freq_offset + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset))) + self.phy_sink.set_center_freq(fc, 0) + self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) + self.tx_freq = fc - def set_rx_gain(self, gain): - self.phy_src.set_gain(gain, 0) - self.rx_gain = gain + def set_rx_gain(self, gain): + self.phy_src.set_gain(gain, 0) + self.rx_gain = gain - def set_tx_gain(self, gain): - self.phy_sink.set_gain(gain, 0) - self.tx_gain = gain + def set_tx_gain(self, gain): + self.phy_sink.set_gain(gain, 0) + self.tx_gain = gain - def set_ta(self, ta): - print("[i] Setting TA value %d" % ta) - advance_time_sec = ta * self.GSM_SYM_PERIOD_uS * 1e-6 - self.tx_time_setter.set_timing_advance(advance_time_sec) + def set_ta(self, ta): + print("[i] Setting TA value %d" % ta) + advance_time_sec = ta * self.GSM_SYM_PERIOD_uS * 1e-6 + self.tx_time_setter.set_timing_advance(advance_time_sec) -- To view, visit https://gerrit.osmocom.org/10782 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: Idf99fd7a581464aa2f77fe01e721dbd162686811 Gerrit-Change-Number: 10782 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:16:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:16:20 +0000 Subject: Change in osmocom-bb[master]: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore 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/10802 to look at the new patch set (#2). Change subject: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... osmocon: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I3ab69a971be555c9f9b5b7a7e5da53008a119504 --- M src/host/osmocon/osmocon.c 1 file changed, 4 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/02/10802/2 -- To view, visit https://gerrit.osmocom.org/10802 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: I3ab69a971be555c9f9b5b7a7e5da53008a119504 Gerrit-Change-Number: 10802 Gerrit-PatchSet: 2 Gerrit-Owner: 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 Sep 6 14:16:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:16:20 +0000 Subject: Change in osmocom-bb[master]: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore 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/10803 to look at the new patch set (#2). Change subject: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... osmoload: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e --- M src/host/osmocon/osmoload.c 1 file changed, 4 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/03/10803/2 -- To view, visit https://gerrit.osmocom.org/10803 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: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e Gerrit-Change-Number: 10803 Gerrit-PatchSet: 2 Gerrit-Owner: 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 Sep 6 14:16:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:16:20 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_sock_unix_init_ofd() 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/10805 to look at the new patch set (#3). Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... layer23: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I57c724c78dbbbce0546ebe914e370f32c8c89703 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/mncc_sock.c 3 files changed, 11 insertions(+), 105 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/10805/3 -- To view, visit https://gerrit.osmocom.org/10805 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: I57c724c78dbbbce0546ebe914e370f32c8c89703 Gerrit-Change-Number: 10805 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:22:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:22:53 +0000 Subject: Change in osmocom-bb[master]: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10802 ) Change subject: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10802 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: I3ab69a971be555c9f9b5b7a7e5da53008a119504 Gerrit-Change-Number: 10802 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 14:22: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 Sep 6 14:22:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:22:56 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10805 ) Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10805 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: I57c724c78dbbbce0546ebe914e370f32c8c89703 Gerrit-Change-Number: 10805 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 14:22:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:23:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:23:13 +0000 Subject: Change in osmocom-bb[master]: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10803 ) Change subject: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10803 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: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e Gerrit-Change-Number: 10803 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 14:23: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 Sep 6 14:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:23:15 +0000 Subject: Change in osmocom-bb[master]: osmocon: Add --enable-{werror, sanitize} configure flags In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10801 ) Change subject: osmocon: Add --enable-{werror,sanitize} configure flags ...................................................................... osmocon: Add --enable-{werror,sanitize} configure flags Change-Id: I6a69ca514406fa18684ca2621be45f87ee8d64a4 --- M src/host/osmocon/configure.ac 1 file changed, 27 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/src/host/osmocon/configure.ac b/src/host/osmocon/configure.ac index 4130800..a42f487 100644 --- a/src/host/osmocon/configure.ac +++ b/src/host/osmocon/configure.ac @@ -21,5 +21,32 @@ dnl Checks for typedefs, structures and compiler characteristics +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 + AC_OUTPUT( Makefile) -- To view, visit https://gerrit.osmocom.org/10801 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: I6a69ca514406fa18684ca2621be45f87ee8d64a4 Gerrit-Change-Number: 10801 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte 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 Sep 6 14:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:23:15 +0000 Subject: Change in osmocom-bb[master]: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10802 ) Change subject: osmocon: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... osmocon: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I3ab69a971be555c9f9b5b7a7e5da53008a119504 --- M src/host/osmocon/osmocon.c 1 file changed, 4 insertions(+), 41 deletions(-) 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 6075e61..26416f7 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -1,6 +1,6 @@ /* osmocon */ -/* (C) 2010 by Harald Welte +/* (C) 2010,2018 by Harald Welte * (C) 2010 by Holger Hans Peter Freyther * (C) 2010 by Steve Markgraf * @@ -45,6 +45,7 @@ #include #include #include +#include #include @@ -1333,47 +1334,14 @@ uint8_t dlci) { struct osmo_fd *bfd = &ts->bfd; - struct sockaddr_un local; - unsigned int namelen; int rc; - bfd->fd = socket(AF_UNIX, SOCK_STREAM, 0); - - if (bfd->fd < 0) { + rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, path, OSMO_SOCK_F_BIND); + if (rc < 0) { fprintf(stderr, "Failed to create Unix Domain Socket.\n"); return -1; } - local.sun_family = AF_UNIX; - strncpy(local.sun_path, path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; - unlink(local.sun_path); - - /* we use the same magic that X11 uses in Xtranssock.c for - * calculating the proper length of the sockaddr */ -#if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); -#endif -#if defined(BSD44SOCKETS) || defined(SUN_LEN) - namelen = SUN_LEN(&local); -#else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); -#endif - - rc = bind(bfd->fd, (struct sockaddr *) &local, namelen); - if (rc != 0) { - fprintf(stderr, "Failed to bind the unix domain socket. '%s'\n", - local.sun_path); - return -1; - } - - if (listen(bfd->fd, 0) != 0) { - fprintf(stderr, "Failed to listen.\n"); - return -1; - } - - bfd->when = BSC_FD_READ; bfd->cb = tool_accept; bfd->data = ts; @@ -1384,11 +1352,6 @@ sercomm_register_rx_cb(dlci, hdlc_tool_cb); - if (osmo_fd_register(bfd) != 0) { - fprintf(stderr, "Failed to register the bfd.\n"); - return -1; - } - return 0; } -- To view, visit https://gerrit.osmocom.org/10802 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: I3ab69a971be555c9f9b5b7a7e5da53008a119504 Gerrit-Change-Number: 10802 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte 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 Sep 6 14:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:23:15 +0000 Subject: Change in osmocom-bb[master]: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10803 ) Change subject: osmoload: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... osmoload: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e --- M src/host/osmocon/osmoload.c 1 file changed, 4 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index 1c20382..b1b48e2 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -1,6 +1,7 @@ /* control utility for the Calypso bootloader */ /* (C) 2010 by Ingo Albrecht + * (C) 2018 by Harald Welte * * All Rights Reserved * @@ -39,6 +40,7 @@ #include #include #include +#include #include @@ -493,34 +495,16 @@ static void loader_connect(const char *socket_path) { int rc; - struct sockaddr_un local; struct osmo_fd *conn = &connection; - local.sun_family = AF_UNIX; - strncpy(local.sun_path, socket_path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; - - conn->fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (conn->fd < 0) { + rc = osmo_sock_unix_init_ofd(conn, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); + if (rc < 0) { fprintf(stderr, "Failed to create unix domain socket.\n"); exit(1); } - rc = connect(conn->fd, (struct sockaddr *) &local, - sizeof(local.sun_family) + strlen(local.sun_path)); - if (rc < 0) { - fprintf(stderr, "Failed to connect to '%s'.\n", local.sun_path); - exit(1); - } - - conn->when = BSC_FD_READ; conn->cb = loader_read_cb; conn->data = NULL; - - if (osmo_fd_register(conn) != 0) { - fprintf(stderr, "Failed to register fd.\n"); - exit(1); - } } static void -- To view, visit https://gerrit.osmocom.org/10803 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: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e Gerrit-Change-Number: 10803 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte 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 Sep 6 14:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:23:16 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_sock_unix_init_ofd() from libosmocore In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10805 ) Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore ...................................................................... layer23: Use osmo_sock_unix_init_ofd() from libosmocore We don't need to hand-code unix domain socket initialization but can simply use our library function for it. As an added benefit, the library code already contains corner case handling for non-NUL terminated unix domain socket path. Change-Id: I57c724c78dbbbce0546ebe914e370f32c8c89703 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/mncc_sock.c 3 files changed, 11 insertions(+), 105 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 3e9cee4..e21b07e 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -1,7 +1,7 @@ /* Layer 1 socket interface of layer2/3 stack */ /* (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by Harald Welte + * (C) 2010,2018 by Harald Welte * * All Rights Reserved * @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -105,39 +106,18 @@ int layer2_open(struct osmocom_ms *ms, const char *socket_path) { int rc; - struct sockaddr_un local; - ms->l2_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (ms->l2_wq.bfd.fd < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); - return ms->l2_wq.bfd.fd; - } - - local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); - - rc = connect(ms->l2_wq.bfd.fd, (struct sockaddr *) &local, - sizeof(local)); + rc = osmo_sock_unix_init_ofd(&ms->l2_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to connect to '%s': %s\n", local.sun_path, - strerror(errno)); - close(ms->l2_wq.bfd.fd); + fprintf(stderr, "Failed to create unix domain socket.\n"); return rc; } osmo_wqueue_init(&ms->l2_wq, 100); ms->l2_wq.bfd.data = ms; - ms->l2_wq.bfd.when = BSC_FD_READ; ms->l2_wq.read_cb = layer2_read; ms->l2_wq.write_cb = layer2_write; - rc = osmo_fd_register(&ms->l2_wq.bfd); - if (rc != 0) { - fprintf(stderr, "Failed to register fd.\n"); - close(ms->l2_wq.bfd.fd); - return rc; - } - return 0; } diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index e18bb31..da03c0f 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -1,7 +1,7 @@ /* BTSAP socket interface of layer2/3 stack */ /* (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by Harald Welte + * (C) 2010,2018 by Harald Welte * (C) 2010 by Andreas Eversberg * (C) 2011 by Nico Golde * @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -499,37 +500,19 @@ int sap_open(struct osmocom_ms *ms, const char *socket_path) { ssize_t rc; - struct sockaddr_un local; - ms->sap_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (ms->sap_wq.bfd.fd < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); - return ms->sap_wq.bfd.fd; - } - - local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); - - rc = connect(ms->sap_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local)); + rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to connect to '%s'\n", local.sun_path); + fprintf(stderr, "Failed to create unix domain socket.\n"); ms->sap_entity.sap_state = SAP_SOCKET_ERROR; - close(ms->sap_wq.bfd.fd); return rc; } osmo_wqueue_init(&ms->sap_wq, 100); ms->sap_wq.bfd.data = ms; - ms->sap_wq.bfd.when = BSC_FD_READ; ms->sap_wq.read_cb = sap_read; ms->sap_wq.write_cb = sap_write; - rc = osmo_fd_register(&ms->sap_wq.bfd); - if (rc != 0) { - fprintf(stderr, "Failed to register fd.\n"); - return rc; - } - sap_connect(ms); return 0; diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 39eb7bc..d7d56cc 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -1,6 +1,6 @@ /* mncc_sock.c: Tie the MNCC interface to a unix domain socket */ -/* (C) 2008-2010 by Harald Welte +/* (C) 2008-2011,2018 by Harald Welte * (C) 2009,2011 by Andreas Eversberg * All Rights Reserved * @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -80,9 +81,6 @@ state->conn_bfd.when |= BSC_FD_WRITE; } -/* FIXME: move this to libosmocore */ -int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path); - static void mncc_sock_close(struct mncc_sock_state *state) { struct osmo_fd *bfd = &state->conn_bfd; @@ -268,7 +266,7 @@ bfd = &state->listen_bfd; - rc = osmo_unixsock_listen(bfd, SOCK_SEQPACKET, name); + rc = osmo_sock_unix_init_ofd(bfd, SOCK_SEQPACKET, 0, name, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DMNCC, LOGL_ERROR, "Could not create unix socket: %s\n", strerror(errno)); @@ -276,18 +274,9 @@ return NULL; } - bfd->when = BSC_FD_READ; bfd->cb = mncc_sock_accept; bfd->data = state; - rc = osmo_fd_register(bfd); - if (rc < 0) { - LOGP(DMNCC, LOGL_ERROR, "Could not register listen fd: %d\n", rc); - close(bfd->fd); - talloc_free(state); - return NULL; - } - return state; } @@ -299,49 +288,3 @@ close(state->listen_bfd.fd); talloc_free(state); } - -/* FIXME: move this to libosmocore */ -int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path) -{ - struct sockaddr_un local; - unsigned int namelen; - int rc; - - bfd->fd = socket(AF_UNIX, type, 0); - - if (bfd->fd < 0) { - fprintf(stderr, "Failed to create Unix Domain Socket.\n"); - return -1; - } - - local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; - unlink(local.sun_path); - - /* we use the same magic that X11 uses in Xtranssock.c for - * calculating the proper length of the sockaddr */ -#if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); -#endif -#if defined(BSD44SOCKETS) || defined(SUN_LEN) - namelen = SUN_LEN(&local); -#else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); -#endif - - rc = bind(bfd->fd, (struct sockaddr *) &local, namelen); - if (rc != 0) { - fprintf(stderr, "Failed to bind the unix domain socket. '%s'\n", - local.sun_path); - return -1; - } - - if (listen(bfd->fd, 0) != 0) { - fprintf(stderr, "Failed to listen.\n"); - return -1; - } - - return 0; -} -- To view, visit https://gerrit.osmocom.org/10805 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: I57c724c78dbbbce0546ebe914e370f32c8c89703 Gerrit-Change-Number: 10805 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:24:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:24:40 +0000 Subject: Change in osmo-pcu[master]: Cleanup of systemd service files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10804 ) Change subject: Cleanup of systemd service files ...................................................................... Patch Set 1: the "sysmopcu" was introduced for backwards compatibility as this is what we used as service/script name in older sysmobts firmware versions (2011/12). I guess by now it's no longer that relevant, and we're not using the debian packages for that anyway. I wonder if our OE recipes still expect the controb/osmo-pcu.service, though? -- To view, visit https://gerrit.osmocom.org/10804 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: Ibd82ec12cbeb73a27ca5860266587efb58be14ab Gerrit-Change-Number: 10804 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Sep 2018 14:24: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 Sep 6 14:25:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:25:02 +0000 Subject: Change in osmo-iuh[master]: debian: package osmo-hnbgw.service In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10798 ) Change subject: debian: package osmo-hnbgw.service ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10798 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: I7b488ddb07916952adab921415ca373aa7c5c1e8 Gerrit-Change-Number: 10798 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 14:25:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:25:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:25:19 +0000 Subject: Change in osmo-iuh[master]: debian: package osmo-hnbgw.service In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10798 ) Change subject: debian: package osmo-hnbgw.service ...................................................................... debian: package osmo-hnbgw.service Change-Id: I7b488ddb07916952adab921415ca373aa7c5c1e8 --- A debian/osmo-hnbgw.service 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/osmo-hnbgw.service b/debian/osmo-hnbgw.service new file mode 120000 index 0000000..e69ea55 --- /dev/null +++ b/debian/osmo-hnbgw.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-hnbgw.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10798 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: I7b488ddb07916952adab921415ca373aa7c5c1e8 Gerrit-Change-Number: 10798 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 Thu Sep 6 14:25:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:25:32 +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 4: Code-Review+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: comment Gerrit-Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd Gerrit-Change-Number: 10495 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Sep 2018 14:25: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 Sep 6 14:25:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:25:58 +0000 Subject: Change in osmo-bts[master]: Move systemd service to contrib/systemd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10796 ) Change subject: Move systemd service to contrib/systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10796 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: I213d3816a66e88069c31f85b3fbf462d1222aa43 Gerrit-Change-Number: 10796 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 14:25: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 Sep 6 14:25:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 14:25:59 +0000 Subject: Change in osmo-bts[master]: Move systemd service to contrib/systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10796 ) Change subject: Move systemd service to contrib/systemd ...................................................................... Move systemd service to contrib/systemd Move it there and have only a symlink in debian/, like we do in all other projects. Change-Id: I213d3816a66e88069c31f85b3fbf462d1222aa43 --- R contrib/systemd/osmo-bts-trx.service R contrib/systemd/osmo-bts-virtual.service A debian/osmo-bts-trx.service A debian/osmo-bts-virtual.service 4 files changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service similarity index 100% rename from debian/osmo-bts-trx.service rename to contrib/systemd/osmo-bts-trx.service diff --git a/debian/osmo-bts-virtual.service b/contrib/systemd/osmo-bts-virtual.service similarity index 100% rename from debian/osmo-bts-virtual.service rename to contrib/systemd/osmo-bts-virtual.service diff --git a/debian/osmo-bts-trx.service b/debian/osmo-bts-trx.service new file mode 120000 index 0000000..1abb0ce --- /dev/null +++ b/debian/osmo-bts-trx.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-bts-trx.service \ No newline at end of file diff --git a/debian/osmo-bts-virtual.service b/debian/osmo-bts-virtual.service new file mode 120000 index 0000000..9a660b4 --- /dev/null +++ b/debian/osmo-bts-virtual.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-bts-virtual.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10796 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: I213d3816a66e88069c31f85b3fbf462d1222aa43 Gerrit-Change-Number: 10796 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 Thu Sep 6 14:35:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 14:35:47 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO outgoing: fix L3 forwarding Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10809 Change subject: inter-BSC HO outgoing: fix L3 forwarding ...................................................................... inter-BSC HO outgoing: fix L3 forwarding Set msgb->l3h when composing the L3 message. Before this, the unset l3h resulted in erratic size in the RSL L3 Info IE. This likely fixes inter-BSC Handover on the outgoing side, to properly forward the RR Handover Command. Change-Id: Ice37242c90c19adbf0795618fd16fe75f0809317 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/10809/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 0dd27fd..a3c889e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -689,7 +689,7 @@ return -EINVAL; msg = rsl_msgb_alloc(); - dst = msgb_put(msg, l3_info_len); + msg->l3h = dst = msgb_put(msg, l3_info_len); memcpy(dst, l3_info, l3_info_len); msg->lchan = lchan; -- To view, visit https://gerrit.osmocom.org/10809 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: Ice37242c90c19adbf0795618fd16fe75f0809317 Gerrit-Change-Number: 10809 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:35:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 14:35:48 +0000 Subject: Change in osmo-bsc[master]: SCCPlite Assignment Complete: include Speech Codec (Chosen) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10810 Change subject: SCCPlite Assignment Complete: include Speech Codec (Chosen) ...................................................................... SCCPlite Assignment Complete: include Speech Codec (Chosen) Compose the Speech Codec (Chosen) IE not only for AoIP, but also for SCCPlite: place the code that assigns the codec to sc_ptr outside of the gscon_is_aoip() if scope. This way the MSC is told the chosen speech codec, which is mandatory for IP based user plane, and was missing until now. Related: OS#3528 Change-Id: Ibedade8d71a7994d25a63bc2faa2a24a10bfffa1 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10810/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index e1da45b..63776f0 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -163,12 +163,12 @@ return; } addr_local_p = &addr_local; - - /* Extrapolate speech codec from speech mode */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ } + + /* Extrapolate speech codec from speech mode */ /* FIXME: AMR codec configuration must be derived from lchan1! */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ } resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, -- To view, visit https://gerrit.osmocom.org/10810 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: Ibedade8d71a7994d25a63bc2faa2a24a10bfffa1 Gerrit-Change-Number: 10810 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 14:41:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 14:41:50 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10782 ) Change subject: grgsm_trx: Migrated argument parsing to argparse ...................................................................... Patch Set 1: > Change has been successfully pushed. Why?? -- To view, visit https://gerrit.osmocom.org/10782 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: Idf99fd7a581464aa2f77fe01e721dbd162686811 Gerrit-Change-Number: 10782 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 14:41:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Sep 6 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Sep 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_#238?= Message-ID: <963063463.153.1536246606490.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_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 -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_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 -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 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_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_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 -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 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_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 Sep 6 15:12:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 15:12:21 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: send HO Complete directly Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10811 Change subject: inter-BSC HO incoming: send HO Complete directly ...................................................................... inter-BSC HO incoming: send HO Complete directly Before Handover is fully completed, the gscon remains in an INIT state. To send back the Handover Complete message, use osmo_bsc_sigtran_send() directly to not thwart the message due to the gscon state. (The gscon state will change to ACTIVE right after that, once the handover FSM is done.) Change-Id: Ic48ae2bb23565015d5e2ccb56308fad09347b51a --- 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/11/10811/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 03e073a..d6b0b6d 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1100,7 +1100,7 @@ return HO_RESULT_ERROR; } - rc = gscon_sigtran_send(conn, msg); + rc = osmo_bsc_sigtran_send(conn, msg); if (rc) { LOG_HO(conn, LOGL_ERROR, "Cannot send BSSMAP Handover Complete message\n"); return HO_RESULT_ERROR; -- To view, visit https://gerrit.osmocom.org/10811 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: Ic48ae2bb23565015d5e2ccb56308fad09347b51a Gerrit-Change-Number: 10811 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 15:14:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Sep 2018 15:14:31 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: send BSSMAP HO Complete directly In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10811 ) Change subject: inter-BSC HO incoming: send BSSMAP HO Complete directly ...................................................................... inter-BSC HO incoming: send BSSMAP HO Complete directly Before Handover is fully completed, the gscon remains in an INIT state. To send back the BSSMAP Handover Complete message, use osmo_bsc_sigtran_send() directly to not thwart the message due to the gscon state. (The gscon state will change to ACTIVE right after that, once the handover FSM is done.) Change-Id: Ic48ae2bb23565015d5e2ccb56308fad09347b51a --- 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/11/10811/2 -- To view, visit https://gerrit.osmocom.org/10811 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: Ic48ae2bb23565015d5e2ccb56308fad09347b51a Gerrit-Change-Number: 10811 Gerrit-PatchSet: 2 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 Thu Sep 6 15:44:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 15:44:28 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix full system upgrade Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10812 Change subject: gr-gsm-master/Dockerfile: fix full system upgrade ...................................................................... gr-gsm-master/Dockerfile: fix full system upgrade Thanks to Piotr, it was discovered that the image building process fails during full system upgrade: RUN pacman -Syu with the following output: looking for conflicting packages... Packages (2) ca-certificates-mozilla-* p11-kit-* ... :: Proceed with installation? [Y/n] The command '/bin/sh -c pacman -Syu' returned a non-zero code: 1 Looks like the '--noconfirm' flag was missing. Change-Id: Icb3ccb9a9531686efcebb3e277421c4c05387b09 --- M gr-gsm-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/10812/1 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index e75d318..8be1a20 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -17,7 +17,7 @@ gcc # Sync pacman -RUN pacman -Syu +RUN pacman -Syyu --noconfirm # Install persistent packages RUN pacman -S --needed --noconfirm \ -- To view, visit https://gerrit.osmocom.org/10812 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: Icb3ccb9a9531686efcebb3e277421c4c05387b09 Gerrit-Change-Number: 10812 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 15:44:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 15:44:28 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10813 Change subject: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm ...................................................................... gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm All required changes from 'fixeria/trx' have been merged. Change-Id: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa --- M gr-gsm-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/10813/1 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 8be1a20..813b66b 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Vadim Yanitskiy ARG LIBOSMOCORE_BRANCH="master" -ARG GR_GSM_BRANCH="fixeria/trx" +ARG GR_GSM_BRANCH="master" # Build dependencies ENV BUILD_DEPS \ -- To view, visit https://gerrit.osmocom.org/10813 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: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa Gerrit-Change-Number: 10813 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 16:11:14 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Sep 2018 16:11:14 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10814 Change subject: measurement: remove missed interval end detection ...................................................................... measurement: remove missed interval end detection The function is_meas_overdue() was introduced to allow lchan_meas_process_measurement() to detect when the end of a measurement interval has been missed. Interval ends may be missed when the SACCH block of the related measurement interval gets lost. This is due to the fact that the SACCH block is used as a trigger to start the measurement result computation. The idea behind is_meas_overdue() was to check the frame number of the current measurement against the frame number of the previous measurement in order to see if there was a measurement for SACCH in between or not. Unfortunately SACCH and TCH Voice data is not necessarly processed in order by each phy. Depending on the phy there may be a jitter between the timing of SACCH and TCH Voice. Depending on the phy this jitter may be enough to mess up the timing so that we see a SACCH block earlier than expected. So we can not use the current frame number of TCH Voice measurements to check for missed SACCH blocks. Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Related: OS#3502 Related: OS#2975 --- 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, 2 insertions(+), 704 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/10814/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index b4fc35b..a2367c8 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -16,6 +16,4 @@ 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 1e547c8..2af8bda 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -322,99 +322,6 @@ return rc; } -/* 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; - uint32_t fn_rounded; - 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_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_by_ts; - else - 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_by_ss[lchan->nr]; - break; - case GSM_PCHAN_CCCH_SDCCH4: - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - modulus = 102; - interval_end = sdcch4_meas_rep_fn102_by_ss[lchan->nr]; - break; - default: - return false; - break; - } - - 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 - * 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_rounded; - 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_rounded - 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_rounded; - return true; - } - } - - return false; -} - /* determine the measurement interval modulus by a given lchan */ static uint8_t modulus_by_lchan(struct gsm_lchan *lchan) { @@ -830,28 +737,8 @@ uint32_t fn_missed_end; bool missed_end; - /* 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); - } + lchan_new_ul_meas(lchan, ulm, fn); + lchan_meas_check_compute(lchan, fn); } /* Reset all measurement related struct members to their initial values. This diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index a33a808..8f50479 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -125,588 +125,6 @@ } -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()\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); - - /* 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, uint32_t fn_end, uint8_t intv_len) { @@ -1152,7 +570,6 @@ printf("*** MEASUREMENT INTERVAL ENDING DETECTION TESTS ***\n"); printf("***************************************************\n"); - test_is_meas_overdue(); test_is_meas_complete(); test_lchan_meas_process_measurement(false, false); test_lchan_meas_process_measurement(true, false); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 3d4f430..e62bb42 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -714,10 +714,6 @@ =========================================================== -Testing is_meas_overdue() - - -=========================================================== Testing is_meas_complete() -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 16:11:14 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Sep 2018 16:11:14 +0000 Subject: Change in osmo-bts[master]: measurement: fix unit-test test_lchan_meas_process_measurement Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10815 Change subject: measurement: fix unit-test test_lchan_meas_process_measurement ...................................................................... measurement: fix unit-test test_lchan_meas_process_measurement The unit test that tests lchan_meas_process_measurement() only inputs test data to lchan_meas_process_measurement() but it is not checked if the interval end could be detected or not. - Add a return code to lchan_meas_process_measurement() - Ensure that the return code is checked in the unit-test Change-Id: I9e00ce683e8c44528804f65181dbfed9e85e3aed Related: OS#2975 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c 3 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/10815/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index a2367c8..4f04ffa 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -8,7 +8,7 @@ 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); +int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); void lchan_meas_reset(struct gsm_lchan *lchan); diff --git a/src/common/measurement.c b/src/common/measurement.c index 2af8bda..de3a82f 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -732,13 +732,13 @@ * 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) +int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { uint32_t fn_missed_end; bool missed_end; lchan_new_ul_meas(lchan, ulm, fn); - lchan_meas_check_compute(lchan, fn); + return lchan_meas_check_compute(lchan, fn); } /* Reset all measurement related struct members to their initial values. This diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 8f50479..d4f3fe6 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -315,6 +315,7 @@ unsigned int fn = 0; unsigned int fn104; struct bts_ul_meas ulm; + int rc; printf("\n\n"); printf("===========================================================\n"); @@ -347,7 +348,8 @@ 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); + rc = lchan_meas_process_measurement(lchan, &ulm, fn); + OSMO_ASSERT(rc == 0); } else if (ulm.is_sub == 1) printf("(leaving out SUB measurement sample for frame number %u)\n", fn); else @@ -363,7 +365,8 @@ if (fn % 104 == 39 && no_sacch == false) { 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); + rc = lchan_meas_process_measurement(lchan, &ulm, fn - 1); + OSMO_ASSERT(rc); } else if (fn % 104 == 39 && no_sacch == true) printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn); } -- To view, visit https://gerrit.osmocom.org/10815 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: I9e00ce683e8c44528804f65181dbfed9e85e3aed Gerrit-Change-Number: 10815 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 16:31:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 16:31:10 +0000 Subject: Change in osmocom-bb[master]: Use uint8_t instead of int8_t for Timing Advance In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/10780 ) Change subject: Use uint8_t instead of int8_t for Timing Advance ...................................................................... Abandoned Ok, it turns out that the TA spoofing logic is broken, but this change would break it even more. -- To view, visit https://gerrit.osmocom.org/10780 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: Ib2ffd24bfb5abb7cc03b20a99628ef18dd365c15 Gerrit-Change-Number: 10780 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 17:28:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 17:28:11 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10814 ) Change subject: measurement: remove missed interval end detection ...................................................................... Patch Set 1: (1 comment) BTW: why not to revert 4553890d? https://gerrit.osmocom.org/#/c/10814/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10814/1/src/common/measurement.c at 737 PS1, Line 737: uint32_t fn_missed_end; : bool missed_end; Not needed anymore. -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 17:28:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 17:32:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 17:32:05 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO outgoing: fix L3 forwarding In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10809 ) Change subject: inter-BSC HO outgoing: fix L3 forwarding ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10809/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/10809/1/src/osmo-bsc/abis_rsl.c at 693 PS1, Line 693: dst cosmetic: I think 'dst' can be completely replaced by 'msg->l3h' here... -- To view, visit https://gerrit.osmocom.org/10809 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: Ice37242c90c19adbf0795618fd16fe75f0809317 Gerrit-Change-Number: 10809 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 17:32:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 18:12:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 18:12:45 +0000 Subject: Change in osmocom-bb[master]: firmware/l23_api.c: cosmetic: use proper format specifier In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10781 to look at the new patch set (#2). Change subject: firmware/l23_api.c: cosmetic: use proper format specifier ...................................................................... firmware/l23_api.c: cosmetic: use proper format specifier The '%u' format specifier should be used for unsigned values. Change-Id: I1108c34e864304126e581d30b75bbd95b93f60b8 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/10781/2 -- To view, visit https://gerrit.osmocom.org/10781 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: I1108c34e864304126e581d30b75bbd95b93f60b8 Gerrit-Change-Number: 10781 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:31:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 20:31:36 +0000 Subject: Change in osmocom-bb[master]: firmware/l23_api.c: cosmetic: use proper format specifier In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10781 ) Change subject: firmware/l23_api.c: cosmetic: use proper format specifier ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10781 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: I1108c34e864304126e581d30b75bbd95b93f60b8 Gerrit-Change-Number: 10781 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 20:31: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 Sep 6 20:31:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 20:31:42 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10783 ) Change subject: trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10783 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: I16ed5c64236c159bfa39002b05094c1f6c171f6b Gerrit-Change-Number: 10783 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 20:31: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 Sep 6 20:31:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:31:43 +0000 Subject: Change in osmocom-bb[master]: common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10816 Change subject: common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() ...................................................................... common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() Despite the correct range of Timing Advance value is [0..63], there is a special feature in OsmocomBB which allows one to simulate the distance between both MS and a BTS by playing with the signal delay. It was discovered that l1ctl_tx_param_req() is using an unsigned 'uint8_t' type for Timing Advance value, while other code and L1CTL protocol is using signed 'int8_t'. This may result in distortion of negative values, so let's fix this! Change-Id: I6ee42b5fa2ca9ebe187f0b933465c49f840a55c2 --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/src/common/l1ctl.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/10816/1 diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 824b1b0..e4dbded 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -14,7 +14,7 @@ uint8_t link_id); /* Transmit L1CTL_PARAM_REQ */ -int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power); +int l1ctl_tx_param_req(struct osmocom_ms *ms, int8_t ta, uint8_t tx_power); int l1ctl_tx_crypto_req(struct osmocom_ms *ms, uint8_t chan_nr, uint8_t algo, uint8_t *key, uint8_t len); diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index f4c214d..3c57042 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -388,7 +388,7 @@ } /* Transmit L1CTL_PARAM_REQ */ -int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power) +int l1ctl_tx_param_req(struct osmocom_ms *ms, int8_t ta, uint8_t tx_power) { struct msgb *msg; struct l1ctl_info_ul *ul; -- To view, visit https://gerrit.osmocom.org/10816 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: I6ee42b5fa2ca9ebe187f0b933465c49f840a55c2 Gerrit-Change-Number: 10816 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:31:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:31:44 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: drop Timing Advance range limitation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10817 Change subject: trxcon/trx_if.c: drop Timing Advance range limitation ...................................................................... trxcon/trx_if.c: drop Timing Advance range limitation Despite the correct range of Timing Advance value is [0..63], there is a special feature in OsmocomBB which allows one to simulate the distance between both MS and a BTS by playing with the signal delay. This is why a signed 'int8_t' type is used in L1CTL protocol. No need to limit the range, just forward it to TRX. Change-Id: I06774b315b8451bf14083da6b2849d6e8594abc8 --- M src/host/trxcon/trx_if.c 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/17/10817/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 89331f3..7e6f7b9 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -405,7 +405,9 @@ * advance calculated from requested TA value. This value is * normally between 0 and 63, with each step representing * an advance of one bit period (about 3.69 microseconds). - * CMD SETTA <0-63> + * Since OsmocomBB has a special feature, which allows one + * to spoof the distance from BTS, the range is extended. + * CMD SETTA <-128..127> * RSP SETTA */ @@ -415,12 +417,6 @@ if (trx->ta == ta) return 0; - /* Make sure that TA value is in valid range */ - if (ta < 0 || ta > 63) { - LOGP(DTRX, LOGL_ERROR, "TA value %d is out of allowed range\n", ta); - return -ENOTSUP; - } - return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); } -- To view, visit https://gerrit.osmocom.org/10817 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: I06774b315b8451bf14083da6b2849d6e8594abc8 Gerrit-Change-Number: 10817 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:31:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:31:44 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx: drop Timing Advance range limitation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10818 Change subject: trx_toolkit/fake_trx: drop Timing Advance range limitation ...................................................................... trx_toolkit/fake_trx: drop Timing Advance range limitation Despite the correct range of Timing Advance value is [0..63], there is a special feature in OsmocomBB which allows one to simulate the distance between both MS and a BTS by playing with the signal delay. So, let's drop the range limitation. Change-Id: I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/18/10818/1 diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 929caf4..808c880 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -119,12 +119,6 @@ elif self.verify_cmd(request, "SETTA", 1): print("[i] Recv SETTA cmd") - # Parse and check TA value - ta = int(request[1]) - if ta < 0 or ta > 63: - print("[!] TA value should be in range: 0..63") - return -1 - # Save to the BurstForwarder instance self.burst_fwd.ta = ta return 0 -- To view, visit https://gerrit.osmocom.org/10818 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: I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7 Gerrit-Change-Number: 10818 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:31:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:31:44 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: refactor Timing Advance handling Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10819 Change subject: trxcon/l1ctl.c: refactor Timing Advance handling ...................................................................... trxcon/l1ctl.c: refactor Timing Advance handling Change-Id: I0e4f18173347e3a7cb875f95d796e8ea20bfc4bf --- M src/host/trxcon/l1ctl.c M src/host/trxcon/trx_if.c 2 files changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/10819/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 49d6a12..90c3aaf 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -653,7 +653,6 @@ { struct l1ctl_par_req *par_req; struct l1ctl_info_ul *ul; - int rc = 0; ul = (struct l1ctl_info_ul *) msg->l1h; par_req = (struct l1ctl_par_req *) ul->payload; @@ -661,13 +660,16 @@ LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_PARAM_REQ " "(ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); - rc |= trx_if_cmd_setta(l1l->trx, par_req->ta); + /* Instruct TRX to use new TA value */ + if (l1l->trx->ta != par_req->ta) { + trx_if_cmd_setta(l1l->trx, par_req->ta); + l1l->trx->ta = par_req->ta; + } - l1l->trx->ta = par_req->ta; l1l->trx->tx_power = par_req->tx_power; msgb_free(msg); - return rc; + return 0; } static int l1ctl_rx_tch_mode_req(struct l1ctl_link *l1l, struct msgb *msg) diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 7e6f7b9..40f1b59 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -413,10 +413,6 @@ int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta) { - /* Do nothing, if requested TA value matches the current */ - if (trx->ta == ta) - return 0; - return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); } -- To view, visit https://gerrit.osmocom.org/10819 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: I0e4f18173347e3a7cb875f95d796e8ea20bfc4bf Gerrit-Change-Number: 10819 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:33:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 20:33:04 +0000 Subject: Change in libosmocore[master]: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9997 ) Change subject: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9997 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: I560de192212dae4705054a1665726369b83d213a Gerrit-Change-Number: 9997 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 20:33: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 Sep 6 20:33:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:33:24 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10783 ) Change subject: trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ ...................................................................... trxcon/l1ctl.c: fix: handle ARFCN from L1CTL_DM_EST_REQ A BSC may allocate a dedicated channel on any ARFCN, not necessary on the same one where a mobile station has requested this channel. For some reason, the ARFCN info of L1CTL_DM_EST_REQ message was not handled by trxcon. Let's fix this. Related: OS#3526 Change-Id: I16ed5c64236c159bfa39002b05094c1f6c171f6b --- M src/host/trxcon/l1ctl.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 49d6a12..b0a4c6d 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -554,6 +554,16 @@ goto exit; } + /* Only if the current ARFCN differs */ + if (l1l->trx->band_arfcn != band_arfcn) { + /* Update current ARFCN */ + l1l->trx->band_arfcn = band_arfcn; + + /* Tune transceiver to required ARFCN */ + trx_if_cmd_rxtune(l1l->trx, band_arfcn); + trx_if_cmd_txtune(l1l->trx, band_arfcn); + } + /* Update TSC (Training Sequence Code) */ l1l->trx->tsc = est_req->tsc; -- To view, visit https://gerrit.osmocom.org/10783 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: I16ed5c64236c159bfa39002b05094c1f6c171f6b Gerrit-Change-Number: 10783 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 20:33:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:33:24 +0000 Subject: Change in osmocom-bb[master]: firmware/l23_api.c: cosmetic: use proper format specifier In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10781 ) Change subject: firmware/l23_api.c: cosmetic: use proper format specifier ...................................................................... firmware/l23_api.c: cosmetic: use proper format specifier The '%u' format specifier should be used for unsigned values. Change-Id: I1108c34e864304126e581d30b75bbd95b93f60b8 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index e53b0c8..e46ca09 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -337,7 +337,7 @@ struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *) l1h->data; struct l1ctl_par_req *par_req = (struct l1ctl_par_req *) ul->payload; - printd("L1CTL_PARAM_REQ (ta=%d, tx_power=%d)\n", par_req->ta, + printd("L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); l1s.ta = par_req->ta; -- To view, visit https://gerrit.osmocom.org/10781 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: I1108c34e864304126e581d30b75bbd95b93f60b8 Gerrit-Change-Number: 10781 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 20:34:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 20:34:03 +0000 Subject: Change in libosmocore[master]: coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9996 ) Change subject: coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9996 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: I4722cae3794ccbb12001113c991d9cf345a52a96 Gerrit-Change-Number: 9996 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 20:34:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:39:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 20:39:33 +0000 Subject: Change in osmo-pcu[master]: Cleanup of systemd service files In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10804 ) Change subject: Cleanup of systemd service files ...................................................................... Patch Set 1: We don't use that one in OE, I looked at it: install -m 0644 ${S}/contrib/osmo-pcu.service ${D}${systemd_system_unitdir}/ -- To view, visit https://gerrit.osmocom.org/10804 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: Ibd82ec12cbeb73a27ca5860266587efb58be14ab Gerrit-Change-Number: 10804 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Sep 2018 20:39:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:39:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Sep 2018 20:39:53 +0000 Subject: Change in osmo-mgw[master]: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( 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 D contrib/systemd/osmo-bsc-mgcp.service M debian/control M debian/copyright D debian/libosmo-legacy-mgcp-dev.install D debian/libosmo-legacy-mgcp0.install D debian/osmo-bsc-mgcp.install D doc/examples/osmo-bsc_mgcp/mgcp.cfg 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 osmoappdesc.py 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 M tests/atlocal.in 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 D tests/vty_test_runner.py 41 files changed, 0 insertions(+), 10,780 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- 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: merged Gerrit-Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd Gerrit-Change-Number: 10495 Gerrit-PatchSet: 5 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 jenkins at lists.osmocom.org Thu Sep 6 20:41:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Sep 2018 20:41:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--disable-gt?= =?UTF-8?Q?p-linux,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#844?= Message-ID: <1375769951.154.1536266474500.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 7.72 KB...] 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... 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... (cached) false 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.43-5594 > .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/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit32gen.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 crc32gen.c GEN crc16gen.c GEN crc64gen.c GEN crc8gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC select.lo CC timer_clockgettime.lo CC msgb.lo CC bitvec.lo CC signal.lo CC bits.lo /bin/bash: line 2: 23114 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 bits.lo -MD -MP -MF $depbase.Tpo -c -o bits.lo bits.c Makefile:548: recipe for target 'bits.lo' failed make[3]: *** [bits.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 gerrit-no-reply at lists.osmocom.org Thu Sep 6 20:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 20:43:42 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10820 Change subject: trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER ...................................................................... trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER I am not sure we need the both control commands, as every burst on DATA interface has a header that includes TX power. Change-Id: Id14603e71df6dedb5a843bb3e20a320192dbca3d --- M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h 2 files changed, 0 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/20/10820/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 89331f3..b3735c2 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -258,31 +258,6 @@ } /* - * SETPOWER sets output power in dB wrt full scale. - * This command fails if the transmitter and receiver are not running. - * CMD SETPOWER - * RSP SETPOWER - */ - -int trx_if_cmd_setpower(struct trx_instance *trx, int db) -{ - return trx_ctrl_cmd(trx, 0, "SETPOWER", "%d", db); -} - -/* - * ADJPOWER adjusts power by the given dB step. - * Response returns resulting power level wrt full scale. - * This command fails if the transmitter and receiver are not running. - * CMD ADJPOWER - * RSP ADJPOWER -*/ - -int trx_if_cmd_adjpower(struct trx_instance *trx, int db) -{ - return trx_ctrl_cmd(trx, 0, "ADJPOWER", "%d", db); -} - -/* * Timeslot Control * * SETSLOT sets the format of the uplink timeslots in the ARFCN. diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index ed6bd3f..be0d41a 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -61,9 +61,6 @@ int trx_if_cmd_poweroff(struct trx_instance *trx); int trx_if_cmd_echo(struct trx_instance *trx); -int trx_if_cmd_setpower(struct trx_instance *trx, int db); -int trx_if_cmd_adjpower(struct trx_instance *trx, int db); - int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta); int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn); -- To view, visit https://gerrit.osmocom.org/10820 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: Id14603e71df6dedb5a843bb3e20a320192dbca3d Gerrit-Change-Number: 10820 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 21:08:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 21:08:48 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10820 ) Change subject: trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10820 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: Id14603e71df6dedb5a843bb3e20a320192dbca3d Gerrit-Change-Number: 10820 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Sep 2018 21:08: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 Sep 6 21:09:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Sep 2018 21:09:05 +0000 Subject: Change in osmocom-bb[master]: trxcon: distinguish between unimplemented and unknown messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: distinguish between unimplemented and unknown messages ...................................................................... Patch Set 4: Code-Review+2 -- 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: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Sep 2018 21: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 Thu Sep 6 21:19:46 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Sep 2018 21:19:46 +0000 Subject: Change in simtrace2[master]: minor: add checks on configurations and functions Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10821 Change subject: minor: add checks on configurations and functions ...................................................................... minor: add checks on configurations and functions these checks prevent out of bounds access and running unset function pointers. Change-Id: Ida889d40b898fc1ab8b885800431833570fdaafe --- M firmware/apps/cardem/main.c 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/21/10821/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 600e4e9..0b5fbde 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -101,7 +101,11 @@ void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum) { TRACE_INFO_WP("cfgChanged%d ", cfgnum); - simtrace_config = cfgnum; + if (cfgnum < ARRAY_SIZE(config_func_ptrs)) { + simtrace_config = cfgnum; + } else { + TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum); + } } void USART1_IrqHandler(void) @@ -204,7 +208,9 @@ } TRACE_INFO("calling init of config %u...\n\r", simtrace_config); - config_func_ptrs[simtrace_config].init(); + if (config_func_ptrs[simtrace_config].init) { + config_func_ptrs[simtrace_config].init(); + } last_simtrace_config = simtrace_config; TRACE_INFO("entering main loop...\n\r"); @@ -232,11 +238,17 @@ if (last_simtrace_config != simtrace_config) { TRACE_INFO("USB config chg %u -> %u\n\r", last_simtrace_config, simtrace_config); - config_func_ptrs[last_simtrace_config].exit(); - config_func_ptrs[simtrace_config].init(); + if (config_func_ptrs[last_simtrace_config].exit) { + config_func_ptrs[last_simtrace_config].exit(); + } + if (config_func_ptrs[simtrace_config].init) { + config_func_ptrs[simtrace_config].init(); + } last_simtrace_config = simtrace_config; } else { - config_func_ptrs[simtrace_config].run(); + if (config_func_ptrs[simtrace_config].run) { + config_func_ptrs[simtrace_config].run(); + } } } } -- To view, visit https://gerrit.osmocom.org/10821 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: Ida889d40b898fc1ab8b885800431833570fdaafe Gerrit-Change-Number: 10821 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 Sep 6 21:19:46 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Sep 2018 21:19:46 +0000 Subject: Change in simtrace2[master]: minor: fix typo in comment Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10822 Change subject: minor: fix typo in comment ...................................................................... minor: fix typo in comment Change-Id: I3edb50abe93bc8574c9c1f25b34f75dab2e8f0ce --- M firmware/apps/cardem/main.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/22/10822/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 0b5fbde..ef24c36 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -129,9 +129,8 @@ return; ch = UART_GetChar(); - /* We must echo the character to make python fdexpect happy, whcih we use in factory testing */ + /* We must echo the character to make python fdexpect happy, which we use in factory testing */ fputc(ch, stdout); - board_exec_dbg_cmd(ch); } -- To view, visit https://gerrit.osmocom.org/10822 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: I3edb50abe93bc8574c9c1f25b34f75dab2e8f0ce Gerrit-Change-Number: 10822 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 Sep 6 21:19:47 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Sep 2018 21:19:47 +0000 Subject: Change in simtrace2[master]: minor: update copyright Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10823 Change subject: minor: update copyright ...................................................................... minor: update copyright Change-Id: Iafcd029be9b3f8cf2e90f08d5e9802912d6a59b1 --- M firmware/apps/cardem/main.c 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/owhw/source/owhw.c M firmware/libboard/qmod/source/board_qmod.c 6 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/23/10823/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index ef24c36..209c79f 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -1,6 +1,7 @@ /* SIMtrace 2 firmware card emulation application * * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 1155158..cb72d40 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -1,5 +1,8 @@ /* SIMtrace 2 common board pin definitions * + * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index 2be6134..8210938 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.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. * diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h index 401fb73..8c0052d 100644 --- a/firmware/libboard/owhw/include/board.h +++ b/firmware/libboard/owhw/include/board.h @@ -1,6 +1,7 @@ /* OWHW board definition * * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c index 2cfa8c6..91c1294 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -1,6 +1,7 @@ /* Card simulator specific functions * * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 9073489..ad1f6b7 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -1,6 +1,7 @@ /* sysmocom quad-modem sysmoQMOD application code * * (C) 2016-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- To view, visit https://gerrit.osmocom.org/10823 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: Iafcd029be9b3f8cf2e90f08d5e9802912d6a59b1 Gerrit-Change-Number: 10823 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 Sep 6 21:19:47 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Sep 2018 21:19:47 +0000 Subject: Change in simtrace2[master]: owhw: add missing function board_exec_dbg_cmd Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10824 Change subject: owhw: add missing function board_exec_dbg_cmd ...................................................................... owhw: add missing function board_exec_dbg_cmd the board_exec_dbg_cmd function was not defined, causing a hard fault on user input Change-Id: I3ecc1f7bdb2484f5a67c36163d33ebc065e4e709 --- M firmware/libboard/owhw/source/owhw.c 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/24/10824/1 diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c index 91c1294..be62660 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -24,6 +24,24 @@ static const Pin pins_cardsim[] = PINS_CARDSIM; +void board_exec_dbg_cmd(int ch) +{ + switch (ch) { + case '?': + printf("\t?\thelp\n\r"); + printf("\tR\treset SAM3\n\r"); + break; + case 'R': + printf("Asking NVIC to reset us\n\r"); + USBD_Disconnect(); + NVIC_SystemReset(); + break; + default: + printf("Unknown command '%c'\n\r", ch); + break; + } +} + void cardsim_set_simpres(uint8_t slot, int present) { if (slot > 1) -- To view, visit https://gerrit.osmocom.org/10824 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: I3ecc1f7bdb2484f5a67c36163d33ebc065e4e709 Gerrit-Change-Number: 10824 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 Sep 6 21:19:47 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Sep 2018 21:19:47 +0000 Subject: Change in simtrace2[master]: owhw: add missing function board_main_top Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10825 Change subject: owhw: add missing function board_main_top ...................................................................... owhw: add missing function board_main_top the board_main_top function was not defined, causing a hard fault when initializing the board Change-Id: Ib92003416648822c4115472992850c592bc4047a --- M firmware/libboard/owhw/source/owhw.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/25/10825/1 diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c index be62660..3bf51ec 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -21,6 +21,7 @@ #include "chip.h" #include "board.h" #include "utils.h" +#include "usb_buf.h" static const Pin pins_cardsim[] = PINS_CARDSIM; @@ -42,6 +43,13 @@ } } +void board_main_top(void) +{ +#ifndef APPLICATION_dfu + usb_buf_init(); +#endif +} + void cardsim_set_simpres(uint8_t slot, int present) { if (slot > 1) -- To view, visit https://gerrit.osmocom.org/10825 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: Ib92003416648822c4115472992850c592bc4047a Gerrit-Change-Number: 10825 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 Sep 6 21:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Sep 2018 21:19:48 +0000 Subject: Change in simtrace2[master]: host: clean library dependencies Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10826 Change subject: host: clean library dependencies ...................................................................... host: clean library dependencies remsim also needs libpcsclite `pkg-config --libs libosmocore` and -losmocore are duplicates `pkg-config --libs libosmosim` is equivalent to -losmosim pthread it needed (by most applications) for static compilation LDFLAGS+= allows static compilation when running LDFLAGS="-static" make Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 --- M host/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/10826/1 diff --git a/host/Makefile b/host/Makefile index 7d5c7a4..aee399c 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,4 +1,4 @@ -LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore +LDFLAGS+=`pkg-config --libs libusb-1.0 libosmocore` -pthread CFLAGS=-Wall -g APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff @@ -6,7 +6,7 @@ all: $(APPS) simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o - $(CC) -o $@ $^ $(LDFLAGS) -losmosim + $(CC) -o $@ $^ $(LDFLAGS) `pkg-config --libs libosmosim libpcsclite` simtrace2-remsim-usb2udp: usb2udp.o simtrace2-discovery.o $(CC) -o $@ $^ $(LDFLAGS) -- To view, visit https://gerrit.osmocom.org/10826 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: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 Gerrit-Change-Number: 10826 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 Sep 6 21:54:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 21:54:27 +0000 Subject: Change in osmocom-bb[master]: trxcon: distinguish between unimplemented and unknown messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: distinguish between unimplemented and unknown messages ...................................................................... trxcon: distinguish between unimplemented and unknown messages Let's differentiate between 'expected' unimplemented messages like L1CTL_NEIGH_PM_REQ and truly unknonw message types. Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 --- M src/host/trxcon/l1ctl.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index b0a4c6d..230ef0a 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -792,6 +792,16 @@ return l1ctl_rx_tch_mode_req(l1l, msg); case L1CTL_CRYPTO_REQ: return l1ctl_rx_crypto_req(l1l, msg); + + /* Not (yet) handled messages */ + case L1CTL_NEIGH_PM_REQ: + case L1CTL_DATA_TBF_REQ: + case L1CTL_TBF_CFG_REQ: + case L1CTL_DM_FREQ_REQ: + case L1CTL_SIM_REQ: + LOGP(DL1C, LOGL_NOTICE, "Ignoring unsupported message " + "(type=%u)\n", l1h->msg_type); + return -ENOTSUP; 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: merged Gerrit-Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 Gerrit-Change-Number: 10432 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte 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 Sep 6 21:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 21:54:28 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10820 ) Change subject: trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER ...................................................................... trxcon/trx_if.c: drop unused SETPOWER and ADJPOWER I am not sure we need the both control commands, as every burst on DATA interface has a header that includes TX power. Change-Id: Id14603e71df6dedb5a843bb3e20a320192dbca3d --- M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h 2 files changed, 0 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 89331f3..b3735c2 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -258,31 +258,6 @@ } /* - * SETPOWER sets output power in dB wrt full scale. - * This command fails if the transmitter and receiver are not running. - * CMD SETPOWER - * RSP SETPOWER - */ - -int trx_if_cmd_setpower(struct trx_instance *trx, int db) -{ - return trx_ctrl_cmd(trx, 0, "SETPOWER", "%d", db); -} - -/* - * ADJPOWER adjusts power by the given dB step. - * Response returns resulting power level wrt full scale. - * This command fails if the transmitter and receiver are not running. - * CMD ADJPOWER - * RSP ADJPOWER -*/ - -int trx_if_cmd_adjpower(struct trx_instance *trx, int db) -{ - return trx_ctrl_cmd(trx, 0, "ADJPOWER", "%d", db); -} - -/* * Timeslot Control * * SETSLOT sets the format of the uplink timeslots in the ARFCN. diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index ed6bd3f..be0d41a 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -61,9 +61,6 @@ int trx_if_cmd_poweroff(struct trx_instance *trx); int trx_if_cmd_echo(struct trx_instance *trx); -int trx_if_cmd_setpower(struct trx_instance *trx, int db); -int trx_if_cmd_adjpower(struct trx_instance *trx, int db); - int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta); int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn); -- To view, visit https://gerrit.osmocom.org/10820 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: Id14603e71df6dedb5a843bb3e20a320192dbca3d Gerrit-Change-Number: 10820 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 6 22:04:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 22:04:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: add SETFH CTRL command support Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10827 Change subject: trxcon/trx_if.c: add SETFH CTRL command support ...................................................................... trxcon/trx_if.c: add SETFH CTRL command support The idea of SETFH command is to instruct transceiver to enable frequency hopping mode using the following parameters: CMD SETFH [... ] Note: since the length of a CTRL command is limited to 128 symbols (BTW: why?), the amount of channels is also limited. Change-Id: Id3d44e6a2796f1ce8523a49dedd5d484052a5c7f --- M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h 2 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/27/10827/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 89331f3..618e102 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -424,6 +424,50 @@ return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); } +/* + * Frequency Hopping parameters indication + * + * SETFH instructs transceiver to enable frequency + * hopping mode using the given parameters. + * CMD SETFH [... ] + */ + +int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, + uint8_t maio, uint16_t *ma, size_t ma_len) +{ + char ma_buf[100]; + char *ptr; + int i, rc; + + /* No channels, WTF?!? */ + if (!ma_len) + return -EINVAL; + + /** + * Compose a sequence of channels (mobile allocation) + * FIXME: the length of a CTRL command is limited to 128 symbols, + * so we may have some problems if there are many channels... + */ + for (i = 0, ptr = ma_buf; i < ma_len; i++) { + /* Append a channel */ + rc = snprintf(ptr, ma_buf + sizeof(ma_buf) - ptr, "%u ", ma[i]); + if (rc < 0) + return rc; + + /* Move pointer */ + ptr += rc; + + /* Prevent buffer overflow */ + if (ptr >= (ma_buf + 100)) + return -EIO; + } + + /* Overwrite the last space */ + *(ptr - 1) = '\0'; + + return trx_ctrl_cmd(trx, 1, "SETFH", "%u %u %s", hsn, maio, ma_buf); +} + /* Get response from CTRL socket */ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) { diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index ed6bd3f..2e9d56f 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -70,6 +70,8 @@ int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn); int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type); +int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, + uint8_t maio, uint16_t *ma, size_t ma_len); int trx_if_cmd_measure(struct trx_instance *trx, uint16_t band_arfcn_start, uint16_t band_arfcn_stop); -- To view, visit https://gerrit.osmocom.org/10827 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: Id3d44e6a2796f1ce8523a49dedd5d484052a5c7f Gerrit-Change-Number: 10827 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 22:04:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Sep 2018 22:04:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10828 Change subject: trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ ...................................................................... trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ Change-Id: I8617b5808748bc4df3d7cc9862ed8cf12613f270 --- M src/host/trxcon/l1ctl.c 1 file changed, 62 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/10828/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index b0a4c6d..026f330 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -526,43 +526,84 @@ return rc; } +static int l1ctl_proc_est_req_h0(struct trx_instance *trx, struct l1ctl_h0 *h) +{ + uint16_t band_arfcn; + int rc = 0; + + band_arfcn = ntohs(h->band_arfcn); + + LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a single " + "ARFCN=%u channel\n", band_arfcn &~ ARFCN_FLAG_MASK); + + /* Do we need to retune? */ + if (trx->band_arfcn == band_arfcn) + return 0; + + /* Tune transceiver to required ARFCN */ + rc |= trx_if_cmd_rxtune(trx, band_arfcn); + rc |= trx_if_cmd_txtune(trx, band_arfcn); + if (rc) + return rc; + + /* Update current ARFCN */ + trx->band_arfcn = band_arfcn; + + return 0; +} + +static int l1ctl_proc_est_req_h1(struct trx_instance *trx, struct l1ctl_h1 *h) +{ + int rc; + + LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a Frequency " + "Hopping (hsn=%u, maio=%u, chans=%u) channel\n", + h->hsn, h->maio, h->n); + + /* No channels?!? */ + if (!h->n) { + LOGP(DL1C, LOGL_ERROR, "No channels in mobile allocation?!?\n"); + return -EINVAL; + } + + /* Forward hopping parameters to TRX */ + rc = trx_if_cmd_setfh(trx, h->hsn, h->maio, h->ma, h->n); + if (rc) + return rc; + + /** + * TODO: update the state of trx_instance somehow + * in order to indicate that it is in hopping mode... + */ + return 0; +} + static int l1ctl_rx_dm_est_req(struct l1ctl_link *l1l, struct msgb *msg) { enum gsm_phys_chan_config config; struct l1ctl_dm_est_req *est_req; struct l1ctl_info_ul *ul; struct trx_ts *ts; - uint16_t band_arfcn; uint8_t chan_nr, tn; - int rc = 0; + int rc; ul = (struct l1ctl_info_ul *) msg->l1h; est_req = (struct l1ctl_dm_est_req *) ul->payload; - band_arfcn = ntohs(est_req->h0.band_arfcn); chan_nr = ul->chan_nr; tn = chan_nr & 0x07; - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ (arfcn=%u, " - "tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", - (band_arfcn &~ ARFCN_FLAG_MASK), tn, chan_nr, - est_req->tsc, est_req->tch_mode); + LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ " + "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", + tn, chan_nr, est_req->tsc, est_req->tch_mode); - if (est_req->h) { - LOGP(DL1C, LOGL_ERROR, "FHSS is not supported\n"); - rc = -ENOTSUP; + /* Frequency hopping? */ + if (est_req->h) + rc = l1ctl_proc_est_req_h1(l1l->trx, &est_req->h1); + else /* Single ARFCN */ + rc = l1ctl_proc_est_req_h0(l1l->trx, &est_req->h0); + if (rc) goto exit; - } - - /* Only if the current ARFCN differs */ - if (l1l->trx->band_arfcn != band_arfcn) { - /* Update current ARFCN */ - l1l->trx->band_arfcn = band_arfcn; - - /* Tune transceiver to required ARFCN */ - trx_if_cmd_rxtune(l1l->trx, band_arfcn); - trx_if_cmd_txtune(l1l->trx, band_arfcn); - } /* Update TSC (Training Sequence Code) */ l1l->trx->tsc = est_req->tsc; -- To view, visit https://gerrit.osmocom.org/10828 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: I8617b5808748bc4df3d7cc9862ed8cf12613f270 Gerrit-Change-Number: 10828 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 22:20:07 2018 From: gerrit-no-reply at lists.osmocom.org (Alexander Chemeris) Date: Thu, 6 Sep 2018 22:20:07 +0000 Subject: Change in libosmocore[master]: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. In-Reply-To: References: Message-ID: Alexander Chemeris has submitted this change and it was merged. ( https://gerrit.osmocom.org/9997 ) Change subject: coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. ...................................................................... coding: Correctly count bits when decoding EDGE bursts with MCS >= 7. They consist of two blocks, so we should count both blocks. Change-Id: I560de192212dae4705054a1665726369b83d213a --- M src/coding/gsm0503_coding.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index c72aabc..088b8bb 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -979,6 +979,9 @@ if (rc < 0) return -EFAULT; } else { + /* Bit counters for the second block */ + int n_errors2, n_bits_total2; + /* MCS-7,8,9 block 1 */ rc = egprs_decode_data(l2_data, c1, cps.mcs, cps.p[0], 0, n_errors, n_bits_total); @@ -987,7 +990,11 @@ /* MCS-7,8,9 block 2 */ rc = egprs_decode_data(l2_data, c2, cps.mcs, cps.p[1], - 1, n_errors, n_bits_total); + 1, &n_errors2, &n_bits_total2); + if (n_errors) + *n_errors += n_errors2; + if (n_bits_total) + *n_bits_total += n_bits_total2; if (rc < 0) return -EFAULT; } -- To view, visit https://gerrit.osmocom.org/9997 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: I560de192212dae4705054a1665726369b83d213a Gerrit-Change-Number: 9997 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 6 22:20:17 2018 From: gerrit-no-reply at lists.osmocom.org (Alexander Chemeris) Date: Thu, 6 Sep 2018 22:20:17 +0000 Subject: Change in libosmocore[master]: coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). In-Reply-To: References: Message-ID: Alexander Chemeris has submitted this change and it was merged. ( https://gerrit.osmocom.org/9996 ) Change subject: coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). ...................................................................... coding: Always initialize bit counters in gsm0503_pdtch_egprs_decode(). Previsouly there were a lot of valid code paths which returned from the function before setting bit counters which led to bogus BER output in osmo-bts-trx logs when those code paths were hit. Change-Id: I4722cae3794ccbb12001113c991d9cf345a52a96 --- M src/coding/gsm0503_coding.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 088b8bb..7385d23 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -938,6 +938,11 @@ struct egprs_cps cps; union gprs_rlc_ul_hdr_egprs *hdr; + if (n_errors) + *n_errors = 0; + if (n_bits_total) + *n_bits_total = 0; + if ((nbits != GSM0503_GPRS_BURSTS_NBITS) && (nbits != GSM0503_EGPRS_BURSTS_NBITS)) { /* Invalid EGPRS bit length */ -- To view, visit https://gerrit.osmocom.org/9996 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: I4722cae3794ccbb12001113c991d9cf345a52a96 Gerrit-Change-Number: 9996 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Chemeris Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Sep 6 22:29:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Sep 2018 22:29:03 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-osmo-ggsn_=C2=BB_--disabl?= =?UTF-8?Q?e-gtp-linux,a2=3Ddefault,a3=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#845?= In-Reply-To: <1375769951.154.1536266474500.JavaMail.jenkins@jenkins.osmocom.org> References: <1375769951.154.1536266474500.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <178018320.155.1536272943753.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Sep 7 02:12:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:12:21 +0000 Subject: Change in libosmocore[master]: api doc: fix osmo_quote_str_* Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10829 Change subject: api doc: fix osmo_quote_str_* ...................................................................... api doc: fix osmo_quote_str_* Change-Id: Ibfd8ff213630e34009936b0fcb3ee50dda65fb70 --- M src/utils.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/10829/1 diff --git a/src/utils.c b/src/utils.c index ea0bbde..3f40f2e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -557,8 +557,8 @@ /*! 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. + * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns buf containing a quoted and escaped representation, possibly truncated. */ const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize) { @@ -587,6 +587,12 @@ return buf; } +/*! Like osmo_quote_str_buf() but returns the result in a static buffer. + * The static buffer is shared with get_value_string() and osmo_escape_str(). + * \param[in] str A string that may contain any characters. + * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns static buffer containing a quoted and escaped representation, possibly truncated. + */ const char *osmo_quote_str(const char *str, int in_len) { return osmo_quote_str_buf(str, in_len, namebuf, sizeof(namebuf)); -- To view, visit https://gerrit.osmocom.org/10829 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: Ibfd8ff213630e34009936b0fcb3ee50dda65fb70 Gerrit-Change-Number: 10829 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 02:12:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:12:37 +0000 Subject: Change in libosmocore[master]: add osmo_str_tolower() and _toupper() with test Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10830 Change subject: add osmo_str_tolower() and _toupper() with test ...................................................................... add osmo_str_tolower() and _toupper() with test We already have osmo_str2lower() and osmo_str2upper(), but these lack: * proper destination buffer bounds checking, * ability to call directly as printf() argument. Deprecate osmo_str2upper() and osmo_str2lower() because of missing bounds checking. Introduce osmo_str_tolower_buf(), osmo_str_toupper_buf() to provide bounds-safe conversion, also able to safely convert a buffer in-place. Introduce osmo_str_tolower(), osmo_str_toupper() that call the above _buf() equivalents using a static buffer[128] and returning the resulting string directly, convenient for direct printing. Possibly truncated but always safe. Add unit tests to utils_test.c. Replace all libosmocore uses of now deprecated osmo_str2lower() and osmo_str2upper(). Naming: the ctype.h API is called tolower() and toupper(), so just prepend 'osmo_str_' and don't separate 'to_lower'. Change-Id: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 --- M include/osmocom/core/utils.h M src/utils.c M src/vty/logging_vty.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 332 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/10830/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 976d4a8..0b54c88 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -7,6 +7,7 @@ #include #include #include +#include /*! \defgroup utils General-purpose utility functions * @{ @@ -57,8 +58,18 @@ #define osmo_static_assert(exp, name) typedef int dummy##name [(exp) ? 1 : -1] __attribute__((__unused__)); -void osmo_str2lower(char *out, const char *in); -void osmo_str2upper(char *out, const char *in); +void osmo_str2lower(char *out, const char *in) + OSMO_DEPRECATED("Use osmo_str_tolower() or osmo_str_tolower_buf() instead," + " to properly check target memory bounds"); +void osmo_str2upper(char *out, const char *in) + OSMO_DEPRECATED("Use osmo_str_toupper() or osmo_str_toupper_buf() instead," + " to properly check target memory bounds"); + +size_t osmo_str_tolower_buf(char *dest, size_t dest_len, const char *src); +const char *osmo_str_tolower(const char *src); + +size_t osmo_str_toupper_buf(char *dest, size_t dest_len, const char *src); +const char *osmo_str_toupper(const char *src); #define OSMO_SNPRINTF_RET(ret, rem, offset, len) \ do { \ diff --git a/src/utils.c b/src/utils.c index 3f40f2e..1934506 100644 --- a/src/utils.c +++ b/src/utils.c @@ -638,4 +638,90 @@ return g0; } +/* Convert a string to lowercase, while checking buffer size boundaries. + * The result written to \a dest is guaranteed to be nul terminated if \a dest_len > 0. + * If dest == src, the string is converted in-place, if necessary truncated at dest_len - 1 characters + * length as well as nul terminated. + * Note: similar osmo_str2lower(), but safe to use for src strings of arbitrary length. + * \param[out] dest Target buffer to write lowercase string. + * \param[in] dest_len Maximum buffer size of dest (e.g. sizeof(dest)). + * \param[in] src String to convert to lowercase. + * \returns Length of \a src, like osmo_strlcpy(), but if \a dest == \a src at most \a dest_len - 1. + */ +size_t osmo_str_tolower_buf(char *dest, size_t dest_len, const char *src) +{ + size_t rc; + if (dest == src) { + if (dest_len < 1) + return 0; + dest[dest_len - 1] = '\0'; + rc = strlen(dest); + } else { + if (dest_len < 1) + return strlen(src); + rc = osmo_strlcpy(dest, src, dest_len); + } + for (; *dest; dest++) + *dest = tolower(*dest); + return rc; +} + +/* Convert a string to lowercase, using a static buffer. + * The resulting string may be truncated if the internally used static buffer is shorter than src. + * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a + * terminating nul. + * See also osmo_str_tolower_buf(). + * \param[in] src String to convert to lowercase. + * \returns Resulting lowercase string in a static buffer, always nul terminated. + */ +const char *osmo_str_tolower(const char *src) +{ + static char buf[128]; + osmo_str_tolower_buf(buf, sizeof(buf), src); + return buf; +} + +/* Convert a string to uppercase, while checking buffer size boundaries. + * The result written to \a dest is guaranteed to be nul terminated if \a dest_len > 0. + * If dest == src, the string is converted in-place, if necessary truncated at dest_len - 1 characters + * length as well as nul terminated. + * Note: similar osmo_str2upper(), but safe to use for src strings of arbitrary length. + * \param[out] dest Target buffer to write uppercase string. + * \param[in] dest_len Maximum buffer size of dest (e.g. sizeof(dest)). + * \param[in] src String to convert to uppercase. + * \returns Length of \a src, like osmo_strlcpy(), but if \a dest == \a src at most \a dest_len - 1. + */ +size_t osmo_str_toupper_buf(char *dest, size_t dest_len, const char *src) +{ + size_t rc; + if (dest == src) { + if (dest_len < 1) + return 0; + dest[dest_len - 1] = '\0'; + rc = strlen(dest); + } else { + if (dest_len < 1) + return strlen(src); + rc = osmo_strlcpy(dest, src, dest_len); + } + for (; *dest; dest++) + *dest = toupper(*dest); + return rc; +} + +/* Convert a string to uppercase, using a static buffer. + * The resulting string may be truncated if the internally used static buffer is shorter than src. + * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a + * terminating nul. + * See also osmo_str_toupper_buf(). + * \param[in] src String to convert to uppercase. + * \returns Resulting uppercase string in a static buffer, always nul terminated. + */ +const char *osmo_str_toupper(const char *src) +{ + static char buf[128]; + osmo_str_toupper_buf(buf, sizeof(buf), src); + return buf; +} + /*! @} */ diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 8c8a332..0a07316 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -806,7 +806,7 @@ VTY_NEWLINE); /* stupid old osmo logging API uses uppercase strings... */ - osmo_str2lower(level_lower, log_level_str(tgt->loglevel)); + osmo_str_tolower_buf(level_lower, sizeof(level_lower), log_level_str(tgt->loglevel)); vty_out(vty, " logging level all %s%s", level_lower, VTY_NEWLINE); for (i = 0; i < osmo_log_info->num_cat; i++) { @@ -818,8 +818,8 @@ continue; /* stupid old osmo logging API uses uppercase strings... */ - osmo_str2lower(cat_lower, osmo_log_info->cat[i].name+1); - osmo_str2lower(level_lower, log_level_str(cat->loglevel)); + osmo_str_tolower_buf(cat_lower, sizeof(cat_lower), osmo_log_info->cat[i].name+1); + osmo_str_tolower_buf(level_lower, sizeof(level_lower), log_level_str(cat->loglevel)); vty_out(vty, " logging level %s %s%s", cat_lower, level_lower, VTY_NEWLINE); } diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index 2f1e87d..2bb1f9c 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -616,6 +616,189 @@ } } +struct osmo_str_tolowupper_test_data { + const char *in; + bool use_static_buf; + size_t buflen; + const char *expect_lower; + const char *expect_upper; + size_t expect_rc; + size_t expect_rc_inplace; +}; + +struct osmo_str_tolowupper_test_data osmo_str_tolowupper_tests[] = { + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .use_static_buf = true, + .expect_lower = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()", + .expect_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 99, + .expect_lower = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()", + .expect_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .expect_rc = 62, + .expect_rc_inplace = 62, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 0, + .expect_lower = "Unset", + .expect_upper = "Unset", + .expect_rc = 62, + .expect_rc_inplace = 0, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 1, + .expect_lower = "", + .expect_upper = "", + .expect_rc = 62, + .expect_rc_inplace = 0, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 2, + .expect_lower = "a", + .expect_upper = "A", + .expect_rc = 62, + .expect_rc_inplace = 1, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 28, + .expect_lower = "abcdefghijklmnopqrstuvwxyza", + .expect_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZA", + .expect_rc = 62, + .expect_rc_inplace = 27, + }, +}; + + +static void osmo_str_tolowupper_test() +{ + int i; + char buf[128]; + bool ok = true; + printf("\n%s\n", __func__); + + for (i = 0; i < ARRAY_SIZE(osmo_str_tolowupper_tests); i++) { + struct osmo_str_tolowupper_test_data *d = &osmo_str_tolowupper_tests[i]; + size_t rc = 0; + const char *res; + + /* tolower */ + if (d->use_static_buf) { + res = osmo_str_tolower(d->in); + printf("osmo_str_tolower(%s)\n", osmo_quote_str(d->in, -1)); + printf(" = %s\n", osmo_quote_str(res, -1)); + } else { + OSMO_ASSERT(sizeof(buf) >= d->buflen); + osmo_strlcpy(buf, "Unset", sizeof(buf)); + rc = osmo_str_tolower_buf(buf, d->buflen, d->in); + res = buf; + printf("osmo_str_tolower_buf(%zu, %s)\n", d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + } + + if (strcmp(res, d->expect_lower)) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_lower, -1)); + ok = false; + } + + if (!d->use_static_buf && d->expect_rc != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower\n" + " got rc=%zu, expected rc=%zu\n", i, rc, d->expect_rc); + ok = false; + } + + /* tolower, in-place */ + if (!d->use_static_buf) { + osmo_strlcpy(buf, + d->buflen ? d->in : "Unset", + sizeof(buf)); + rc = osmo_str_tolower_buf(buf, d->buflen, buf); + res = buf; + printf("osmo_str_tolower_buf(%zu, %s, in-place)\n", + d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + + if (strcmp(res, d->expect_lower)) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower in-place\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_lower, -1)); + ok = false; + } + + if (d->expect_rc_inplace != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower in-place\n" + " got rc=%zu, expected rc=%zu\n", + i, rc, d->expect_rc_inplace); + ok = false; + } + } + + /* toupper */ + if (d->use_static_buf) { + res = osmo_str_toupper(d->in); + printf("osmo_str_toupper(%s)\n", osmo_quote_str(d->in, -1)); + printf(" = %s\n", osmo_quote_str(res, -1)); + } else { + OSMO_ASSERT(sizeof(buf) >= d->buflen); + osmo_strlcpy(buf, "Unset", sizeof(buf)); + rc = osmo_str_toupper_buf(buf, d->buflen, d->in); + res = buf; + printf("osmo_str_toupper_buf(%zu, %s)\n", d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + } + + if (strcmp(res, d->expect_upper)) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_upper, -1)); + ok = false; + } + + if (!d->use_static_buf && d->expect_rc != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper\n" + " got rc=%zu, expected rc=%zu\n", i, rc, d->expect_rc); + ok = false; + } + + /* toupper, in-place */ + if (!d->use_static_buf) { + osmo_strlcpy(buf, + d->buflen ? d->in : "Unset", + sizeof(buf)); + rc = osmo_str_toupper_buf(buf, d->buflen, buf); + res = buf; + printf("osmo_str_toupper_buf(%zu, %s, in-place)\n", + d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + + if (strcmp(res, d->expect_upper)) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper in-place\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_upper, -1)); + ok = false; + } + + if (d->expect_rc_inplace != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper in-place\n" + " got rc=%zu, expected rc=%zu\n", + i, rc, d->expect_rc_inplace); + ok = false; + } + } + } + + OSMO_ASSERT(ok); +} + + int main(int argc, char **argv) { static const struct log_info log_info = {}; @@ -631,5 +814,6 @@ str_quote_test(); isqrt_test(); osmo_sockaddr_to_str_and_uint_test(); + osmo_str_tolowupper_test(); return 0; } diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index abc7317..3ea8ec6 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -153,3 +153,49 @@ [5] 234.23.42.123:1234 (omit addr) addr_len=0 --> :1234 rc=0 [6] 234.23.42.123:1234 addr_len=0 --> :1234 rc=13 [7] 234.23.42.123:1234 (omit addr) (omit port) addr_len=0 --> :0 rc=0 + +osmo_str_tolowupper_test +osmo_str_tolower("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()" +osmo_str_toupper("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()" +osmo_str_tolower_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()" +osmo_str_tolower_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 62, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()" +osmo_str_toupper_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()" +osmo_str_toupper_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()" +osmo_str_tolower_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "Unset" +osmo_str_tolower_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "Unset" +osmo_str_toupper_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "Unset" +osmo_str_toupper_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "Unset" +osmo_str_tolower_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "" +osmo_str_tolower_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "" +osmo_str_toupper_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "" +osmo_str_toupper_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "" +osmo_str_tolower_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "a" +osmo_str_tolower_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 1, "a" +osmo_str_toupper_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "A" +osmo_str_toupper_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 1, "A" +osmo_str_tolower_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "abcdefghijklmnopqrstuvwxyza" +osmo_str_tolower_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 27, "abcdefghijklmnopqrstuvwxyza" +osmo_str_toupper_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZA" +osmo_str_toupper_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 27, "ABCDEFGHIJKLMNOPQRSTUVWXYZA" -- To view, visit https://gerrit.osmocom.org/10830 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: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 Gerrit-Change-Number: 10830 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 02:13:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:13:35 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): match conn Id ('I:') despite leading zeros 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/10678 to look at the new patch set (#4). 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. Now, mgcp_conn_get() would match a valid id with *any* amount of leading zeros, even if that far surpasses the permitted conn id length. Valid lengths of incoming conn ids should be and is checked elsewhere. Related: OS#3509 Depends: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 (libosmocore) 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/4 -- 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: newpatchset Gerrit-Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 Gerrit-Change-Number: 10678 Gerrit-PatchSet: 4 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 Sep 7 02:14:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:14:56 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): match conn Id ('I:') despite leading zeros 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/10678 to look at the new patch set (#5). 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. Now, mgcp_conn_get() would match a valid id with *any* amount of leading zeros, even if that far surpasses the permitted conn id length. Valid lengths of incoming conn ids should be and is checked elsewhere. 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/5 -- 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: newpatchset Gerrit-Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 Gerrit-Change-Number: 10678 Gerrit-PatchSet: 5 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 Sep 7 02:14:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:14:56 +0000 Subject: Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response() 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/10679 to look at the new patch set (#5). 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/5 -- 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: newpatchset Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b Gerrit-Change-Number: 10679 Gerrit-PatchSet: 5 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 Sep 7 02:14:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:14:56 +0000 Subject: Change in osmo-mgw[master]: comment: indicate struct type for mgcp_endpoint.conns 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/10680 to look at the new patch set (#5). 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/5 -- 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: newpatchset Gerrit-Change-Id: Ia65359c22da3e7b28e3f23b36446ca434ca0be8c Gerrit-Change-Number: 10680 Gerrit-PatchSet: 5 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 Sep 7 02:18:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:18:43 +0000 Subject: Change in libosmocore[master]: add osmo_str_tolower() and _toupper() with test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10830 to look at the new patch set (#2). Change subject: add osmo_str_tolower() and _toupper() with test ...................................................................... add osmo_str_tolower() and _toupper() with test We already have osmo_str2lower() and osmo_str2upper(), but these lack: * proper destination buffer bounds checking, * ability to call directly as printf() argument. Deprecate osmo_str2upper() and osmo_str2lower() because of missing bounds checking. Introduce osmo_str_tolower_buf(), osmo_str_toupper_buf() to provide bounds-safe conversion, also able to safely convert a buffer in-place. Introduce osmo_str_tolower(), osmo_str_toupper() that call the above _buf() equivalents using a static buffer[128] and returning the resulting string directly, convenient for direct printing. Possibly truncated but always safe. Add unit tests to utils_test.c. Replace all libosmocore uses of now deprecated osmo_str2lower() and osmo_str2upper(). Naming: the ctype.h API is called tolower() and toupper(), so just prepend 'osmo_str_' and don't separate 'to_lower'. Change-Id: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 --- M include/osmocom/core/utils.h M src/utils.c M src/vty/logging_vty.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 332 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/10830/2 -- To view, visit https://gerrit.osmocom.org/10830 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: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 Gerrit-Change-Number: 10830 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 Fri Sep 7 02:30:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:30:51 +0000 Subject: Change in libosmocore[master]: add osmo_str_tolower() and _toupper() with test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10830 to look at the new patch set (#3). Change subject: add osmo_str_tolower() and _toupper() with test ...................................................................... add osmo_str_tolower() and _toupper() with test We already have osmo_str2lower() and osmo_str2upper(), but these lack: * proper destination buffer bounds checking, * ability to call directly as printf() argument. Deprecate osmo_str2upper() and osmo_str2lower() because of missing bounds checking. Introduce osmo_str_tolower_buf(), osmo_str_toupper_buf() to provide bounds-safe conversion, also able to safely convert a buffer in-place. Introduce osmo_str_tolower(), osmo_str_toupper() that call the above _buf() equivalents using a static buffer[128] and returning the resulting string directly, convenient for direct printing. Possibly truncated but always safe. Add unit tests to utils_test.c. Replace all libosmocore uses of now deprecated osmo_str2lower(). Naming: the ctype.h API is called tolower() and toupper(), so just prepend 'osmo_str_' and don't separate 'to_lower'. Change-Id: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 --- M include/osmocom/core/utils.h M src/utils.c M src/vty/logging_vty.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 333 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/10830/3 -- To view, visit https://gerrit.osmocom.org/10830 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: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 Gerrit-Change-Number: 10830 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 Fri Sep 7 02:34:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:34:10 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10677 ) Change subject: mgcp_conn_get(): compare conn Id ('I:') case insensitively ...................................................................... Set Ready For Review -- 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: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 07 Sep 2018 02:34: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 Sep 7 02:34:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 02:34:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10677 ) Change subject: mgcp_conn_get(): compare conn Id ('I:') case insensitively ...................................................................... Patch Set 5: note the added "Depends:" on a libosmocore patch adding osmo_str_toupper() -- 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: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 07 Sep 2018 02:34:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 06:29:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:29:55 +0000 Subject: Change in osmo-pcu[master]: Cleanup of systemd service files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10804 ) Change subject: Cleanup of systemd service files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10804 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: Ibd82ec12cbeb73a27ca5860266587efb58be14ab Gerrit-Change-Number: 10804 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, 07 Sep 2018 06:29:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 06:29:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:29:57 +0000 Subject: Change in osmo-pcu[master]: Cleanup of systemd service files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10804 ) Change subject: Cleanup of systemd service files ...................................................................... Cleanup of systemd service files Let's use a symlink in debian/ as we do in other projects, and merge the two service files since anyway they call the same binary. Change-Id: Ibd82ec12cbeb73a27ca5860266587efb58be14ab --- M contrib/osmo-pcu.service D contrib/sysmopcu.service D debian/osmo-pcu.service A debian/osmo-pcu.service 4 files changed, 2 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/osmo-pcu.service b/contrib/osmo-pcu.service index 3066a66..6329d31 100644 --- a/contrib/osmo-pcu.service +++ b/contrib/osmo-pcu.service @@ -1,5 +1,5 @@ [Unit] -Description=sysmocom sysmoPCU +Description=Osmocom osmo-pcu [Service] Type=simple @@ -14,4 +14,3 @@ [Install] WantedBy=multi-user.target -Alias=sysmopcu.service diff --git a/contrib/sysmopcu.service b/contrib/sysmopcu.service deleted file mode 100644 index df8c47e..0000000 --- a/contrib/sysmopcu.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=sysmocom sysmoPCU - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg -Restart=always -RestartSec=2 -RestartPreventExitStatus=1 - -# The msg queues must be read fast enough -CPUSchedulingPolicy=rr -CPUSchedulingPriority=1 - -[Install] -WantedBy=multi-user.target -Alias=osmo-pcu.service diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service deleted file mode 100644 index 850a715..0000000 --- a/debian/osmo-pcu.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Osmocom osmo-pcu - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg -Restart=always -RestartSec=2 - -# Read quickly enough -CPUSchedulingPolicy=rr -CPUSchedulingPriority=1 - -[Install] -WantedBy=multi-user.target diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service new file mode 120000 index 0000000..f077431 --- /dev/null +++ b/debian/osmo-pcu.service @@ -0,0 +1 @@ +../contrib/osmo-pcu.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10804 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: Ibd82ec12cbeb73a27ca5860266587efb58be14ab Gerrit-Change-Number: 10804 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 Fri Sep 7 06:30:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:30:25 +0000 Subject: Change in simtrace2[master]: minor: add checks on configurations and functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10821 ) Change subject: minor: add checks on configurations and functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10821 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: Ida889d40b898fc1ab8b885800431833570fdaafe Gerrit-Change-Number: 10821 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 06:30: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 Sep 7 06:30:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:30:32 +0000 Subject: Change in simtrace2[master]: minor: fix typo in comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10822 ) Change subject: minor: fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10822 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: I3edb50abe93bc8574c9c1f25b34f75dab2e8f0ce Gerrit-Change-Number: 10822 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 06:30: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 Sep 7 06:30:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:30:45 +0000 Subject: Change in simtrace2[master]: minor: update copyright In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10823 ) Change subject: minor: update copyright ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10823 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: Iafcd029be9b3f8cf2e90f08d5e9802912d6a59b1 Gerrit-Change-Number: 10823 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 06:30: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 Sep 7 06:31:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:35 +0000 Subject: Change in simtrace2[master]: host: clean library dependencies In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10826 ) Change subject: host: clean library dependencies ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10826 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: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 Gerrit-Change-Number: 10826 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 06: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 Fri Sep 7 06:31:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:44 +0000 Subject: Change in simtrace2[master]: owhw: add missing function board_exec_dbg_cmd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10824 ) Change subject: owhw: add missing function board_exec_dbg_cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10824 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: I3ecc1f7bdb2484f5a67c36163d33ebc065e4e709 Gerrit-Change-Number: 10824 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 06:31:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 06:31:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:46 +0000 Subject: Change in simtrace2[master]: owhw: add missing function board_main_top In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10825 ) Change subject: owhw: add missing function board_main_top ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10825 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: Ib92003416648822c4115472992850c592bc4047a Gerrit-Change-Number: 10825 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 06:31: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 Sep 7 06:31:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:49 +0000 Subject: Change in simtrace2[master]: minor: add checks on configurations and functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10821 ) Change subject: minor: add checks on configurations and functions ...................................................................... minor: add checks on configurations and functions these checks prevent out of bounds access and running unset function pointers. Change-Id: Ida889d40b898fc1ab8b885800431833570fdaafe --- M firmware/apps/cardem/main.c 1 file changed, 17 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 600e4e9..0b5fbde 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -101,7 +101,11 @@ void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum) { TRACE_INFO_WP("cfgChanged%d ", cfgnum); - simtrace_config = cfgnum; + if (cfgnum < ARRAY_SIZE(config_func_ptrs)) { + simtrace_config = cfgnum; + } else { + TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum); + } } void USART1_IrqHandler(void) @@ -204,7 +208,9 @@ } TRACE_INFO("calling init of config %u...\n\r", simtrace_config); - config_func_ptrs[simtrace_config].init(); + if (config_func_ptrs[simtrace_config].init) { + config_func_ptrs[simtrace_config].init(); + } last_simtrace_config = simtrace_config; TRACE_INFO("entering main loop...\n\r"); @@ -232,11 +238,17 @@ if (last_simtrace_config != simtrace_config) { TRACE_INFO("USB config chg %u -> %u\n\r", last_simtrace_config, simtrace_config); - config_func_ptrs[last_simtrace_config].exit(); - config_func_ptrs[simtrace_config].init(); + if (config_func_ptrs[last_simtrace_config].exit) { + config_func_ptrs[last_simtrace_config].exit(); + } + if (config_func_ptrs[simtrace_config].init) { + config_func_ptrs[simtrace_config].init(); + } last_simtrace_config = simtrace_config; } else { - config_func_ptrs[simtrace_config].run(); + if (config_func_ptrs[simtrace_config].run) { + config_func_ptrs[simtrace_config].run(); + } } } } -- To view, visit https://gerrit.osmocom.org/10821 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: Ida889d40b898fc1ab8b885800431833570fdaafe Gerrit-Change-Number: 10821 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 Fri Sep 7 06:31:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:49 +0000 Subject: Change in simtrace2[master]: minor: fix typo in comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10822 ) Change subject: minor: fix typo in comment ...................................................................... minor: fix typo in comment Change-Id: I3edb50abe93bc8574c9c1f25b34f75dab2e8f0ce --- M firmware/apps/cardem/main.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 0b5fbde..ef24c36 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -129,9 +129,8 @@ return; ch = UART_GetChar(); - /* We must echo the character to make python fdexpect happy, whcih we use in factory testing */ + /* We must echo the character to make python fdexpect happy, which we use in factory testing */ fputc(ch, stdout); - board_exec_dbg_cmd(ch); } -- To view, visit https://gerrit.osmocom.org/10822 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: I3edb50abe93bc8574c9c1f25b34f75dab2e8f0ce Gerrit-Change-Number: 10822 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 Fri Sep 7 06:31:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:50 +0000 Subject: Change in simtrace2[master]: minor: update copyright In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10823 ) Change subject: minor: update copyright ...................................................................... minor: update copyright Change-Id: Iafcd029be9b3f8cf2e90f08d5e9802912d6a59b1 --- M firmware/apps/cardem/main.c 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/owhw/source/owhw.c M firmware/libboard/qmod/source/board_qmod.c 6 files changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index ef24c36..209c79f 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -1,6 +1,7 @@ /* SIMtrace 2 firmware card emulation application * * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 1155158..cb72d40 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -1,5 +1,8 @@ /* SIMtrace 2 common board pin definitions * + * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index 2be6134..8210938 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.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. * diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h index 401fb73..8c0052d 100644 --- a/firmware/libboard/owhw/include/board.h +++ b/firmware/libboard/owhw/include/board.h @@ -1,6 +1,7 @@ /* OWHW board definition * * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c index 2cfa8c6..91c1294 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -1,6 +1,7 @@ /* Card simulator specific functions * * (C) 2015-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 9073489..ad1f6b7 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -1,6 +1,7 @@ /* sysmocom quad-modem sysmoQMOD application code * * (C) 2016-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- To view, visit https://gerrit.osmocom.org/10823 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: Iafcd029be9b3f8cf2e90f08d5e9802912d6a59b1 Gerrit-Change-Number: 10823 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 Fri Sep 7 06:31:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:51 +0000 Subject: Change in simtrace2[master]: owhw: add missing function board_exec_dbg_cmd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10824 ) Change subject: owhw: add missing function board_exec_dbg_cmd ...................................................................... owhw: add missing function board_exec_dbg_cmd the board_exec_dbg_cmd function was not defined, causing a hard fault on user input Change-Id: I3ecc1f7bdb2484f5a67c36163d33ebc065e4e709 --- M firmware/libboard/owhw/source/owhw.c 1 file changed, 18 insertions(+), 0 deletions(-) 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 91c1294..be62660 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -24,6 +24,24 @@ static const Pin pins_cardsim[] = PINS_CARDSIM; +void board_exec_dbg_cmd(int ch) +{ + switch (ch) { + case '?': + printf("\t?\thelp\n\r"); + printf("\tR\treset SAM3\n\r"); + break; + case 'R': + printf("Asking NVIC to reset us\n\r"); + USBD_Disconnect(); + NVIC_SystemReset(); + break; + default: + printf("Unknown command '%c'\n\r", ch); + break; + } +} + void cardsim_set_simpres(uint8_t slot, int present) { if (slot > 1) -- To view, visit https://gerrit.osmocom.org/10824 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: I3ecc1f7bdb2484f5a67c36163d33ebc065e4e709 Gerrit-Change-Number: 10824 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 Fri Sep 7 06:31:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:51 +0000 Subject: Change in simtrace2[master]: owhw: add missing function board_main_top In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10825 ) Change subject: owhw: add missing function board_main_top ...................................................................... owhw: add missing function board_main_top the board_main_top function was not defined, causing a hard fault when initializing the board Change-Id: Ib92003416648822c4115472992850c592bc4047a --- M firmware/libboard/owhw/source/owhw.c 1 file changed, 8 insertions(+), 0 deletions(-) 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 be62660..3bf51ec 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -21,6 +21,7 @@ #include "chip.h" #include "board.h" #include "utils.h" +#include "usb_buf.h" static const Pin pins_cardsim[] = PINS_CARDSIM; @@ -42,6 +43,13 @@ } } +void board_main_top(void) +{ +#ifndef APPLICATION_dfu + usb_buf_init(); +#endif +} + void cardsim_set_simpres(uint8_t slot, int present) { if (slot > 1) -- To view, visit https://gerrit.osmocom.org/10825 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: Ib92003416648822c4115472992850c592bc4047a Gerrit-Change-Number: 10825 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 Fri Sep 7 06:31:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 06:31:53 +0000 Subject: Change in simtrace2[master]: host: clean library dependencies In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10826 ) Change subject: host: clean library dependencies ...................................................................... host: clean library dependencies remsim also needs libpcsclite `pkg-config --libs libosmocore` and -losmocore are duplicates `pkg-config --libs libosmosim` is equivalent to -losmosim pthread it needed (by most applications) for static compilation LDFLAGS+= allows static compilation when running LDFLAGS="-static" make Change-Id: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 --- M host/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/host/Makefile b/host/Makefile index 7d5c7a4..aee399c 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,4 +1,4 @@ -LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore +LDFLAGS+=`pkg-config --libs libusb-1.0 libosmocore` -pthread CFLAGS=-Wall -g APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff @@ -6,7 +6,7 @@ all: $(APPS) simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o - $(CC) -o $@ $^ $(LDFLAGS) -losmosim + $(CC) -o $@ $^ $(LDFLAGS) `pkg-config --libs libosmosim libpcsclite` simtrace2-remsim-usb2udp: usb2udp.o simtrace2-discovery.o $(CC) -o $@ $^ $(LDFLAGS) -- To view, visit https://gerrit.osmocom.org/10826 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: Ic7bd6f2be074d6f652d4f84f4996c8588ea5f851 Gerrit-Change-Number: 10826 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 Fri Sep 7 09:01:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:01:41 +0000 Subject: Change in osmocom-bb[master]: common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10816 ) Change subject: common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10816 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: I6ee42b5fa2ca9ebe187f0b933465c49f840a55c2 Gerrit-Change-Number: 10816 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:01: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 Sep 7 09:01:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:01:55 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: drop Timing Advance range limitation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10817 ) Change subject: trxcon/trx_if.c: drop Timing Advance range limitation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10817 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: I06774b315b8451bf14083da6b2849d6e8594abc8 Gerrit-Change-Number: 10817 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:01:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 09:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:02:06 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx: drop Timing Advance range limitation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10818 ) Change subject: trx_toolkit/fake_trx: drop Timing Advance range limitation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10818 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: I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7 Gerrit-Change-Number: 10818 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:02:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 09:02:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:02:19 +0000 Subject: Change in osmocom-bb[master]: common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10816 ) Change subject: common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() ...................................................................... common/l1ctl.c: fix: use signed type for TA in l1ctl_tx_param_req() Despite the correct range of Timing Advance value is [0..63], there is a special feature in OsmocomBB which allows one to simulate the distance between both MS and a BTS by playing with the signal delay. It was discovered that l1ctl_tx_param_req() is using an unsigned 'uint8_t' type for Timing Advance value, while other code and L1CTL protocol is using signed 'int8_t'. This may result in distortion of negative values, so let's fix this! Change-Id: I6ee42b5fa2ca9ebe187f0b933465c49f840a55c2 --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/src/common/l1ctl.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 824b1b0..e4dbded 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -14,7 +14,7 @@ uint8_t link_id); /* Transmit L1CTL_PARAM_REQ */ -int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power); +int l1ctl_tx_param_req(struct osmocom_ms *ms, int8_t ta, uint8_t tx_power); int l1ctl_tx_crypto_req(struct osmocom_ms *ms, uint8_t chan_nr, uint8_t algo, uint8_t *key, uint8_t len); diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index f4c214d..3c57042 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -388,7 +388,7 @@ } /* Transmit L1CTL_PARAM_REQ */ -int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power) +int l1ctl_tx_param_req(struct osmocom_ms *ms, int8_t ta, uint8_t tx_power) { struct msgb *msg; struct l1ctl_info_ul *ul; -- To view, visit https://gerrit.osmocom.org/10816 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: I6ee42b5fa2ca9ebe187f0b933465c49f840a55c2 Gerrit-Change-Number: 10816 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 7 09:02:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:02:19 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: drop Timing Advance range limitation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10817 ) Change subject: trxcon/trx_if.c: drop Timing Advance range limitation ...................................................................... trxcon/trx_if.c: drop Timing Advance range limitation Despite the correct range of Timing Advance value is [0..63], there is a special feature in OsmocomBB which allows one to simulate the distance between both MS and a BTS by playing with the signal delay. This is why a signed 'int8_t' type is used in L1CTL protocol. No need to limit the range, just forward it to TRX. Change-Id: I06774b315b8451bf14083da6b2849d6e8594abc8 --- M src/host/trxcon/trx_if.c 1 file changed, 3 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index b3735c2..19d8c75 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -380,7 +380,9 @@ * advance calculated from requested TA value. This value is * normally between 0 and 63, with each step representing * an advance of one bit period (about 3.69 microseconds). - * CMD SETTA <0-63> + * Since OsmocomBB has a special feature, which allows one + * to spoof the distance from BTS, the range is extended. + * CMD SETTA <-128..127> * RSP SETTA */ @@ -390,12 +392,6 @@ if (trx->ta == ta) return 0; - /* Make sure that TA value is in valid range */ - if (ta < 0 || ta > 63) { - LOGP(DTRX, LOGL_ERROR, "TA value %d is out of allowed range\n", ta); - return -ENOTSUP; - } - return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); } -- To view, visit https://gerrit.osmocom.org/10817 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: I06774b315b8451bf14083da6b2849d6e8594abc8 Gerrit-Change-Number: 10817 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 7 09:02:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:02:20 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx: drop Timing Advance range limitation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10818 ) Change subject: trx_toolkit/fake_trx: drop Timing Advance range limitation ...................................................................... trx_toolkit/fake_trx: drop Timing Advance range limitation Despite the correct range of Timing Advance value is [0..63], there is a special feature in OsmocomBB which allows one to simulate the distance between both MS and a BTS by playing with the signal delay. So, let's drop the range limitation. Change-Id: I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 929caf4..808c880 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -119,12 +119,6 @@ elif self.verify_cmd(request, "SETTA", 1): print("[i] Recv SETTA cmd") - # Parse and check TA value - ta = int(request[1]) - if ta < 0 or ta > 63: - print("[!] TA value should be in range: 0..63") - return -1 - # Save to the BurstForwarder instance self.burst_fwd.ta = ta return 0 -- To view, visit https://gerrit.osmocom.org/10818 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: I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7 Gerrit-Change-Number: 10818 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 7 09:02:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:02:35 +0000 Subject: Change in libosmocore[master]: api doc: fix osmo_quote_str_* In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10829 ) Change subject: api doc: fix osmo_quote_str_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10829 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: Ibfd8ff213630e34009936b0fcb3ee50dda65fb70 Gerrit-Change-Number: 10829 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09: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 Sep 7 09:02:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:02:36 +0000 Subject: Change in libosmocore[master]: api doc: fix osmo_quote_str_* In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10829 ) Change subject: api doc: fix osmo_quote_str_* ...................................................................... api doc: fix osmo_quote_str_* Change-Id: Ibfd8ff213630e34009936b0fcb3ee50dda65fb70 --- M src/utils.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/utils.c b/src/utils.c index ea0bbde..3f40f2e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -557,8 +557,8 @@ /*! 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. + * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns buf containing a quoted and escaped representation, possibly truncated. */ const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize) { @@ -587,6 +587,12 @@ return buf; } +/*! Like osmo_quote_str_buf() but returns the result in a static buffer. + * The static buffer is shared with get_value_string() and osmo_escape_str(). + * \param[in] str A string that may contain any characters. + * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns static buffer containing a quoted and escaped representation, possibly truncated. + */ const char *osmo_quote_str(const char *str, int in_len) { return osmo_quote_str_buf(str, in_len, namebuf, sizeof(namebuf)); -- To view, visit https://gerrit.osmocom.org/10829 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: Ibfd8ff213630e34009936b0fcb3ee50dda65fb70 Gerrit-Change-Number: 10829 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 Sep 7 09:03:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:03:20 +0000 Subject: Change in libosmocore[master]: add osmo_str_tolower() and _toupper() with test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10830 ) Change subject: add osmo_str_tolower() and _toupper() with test ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10830 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: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 Gerrit-Change-Number: 10830 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:03: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 Sep 7 09:03:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:03:32 +0000 Subject: Change in libosmocore[master]: add osmo_str_tolower() and _toupper() with test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10830 ) Change subject: add osmo_str_tolower() and _toupper() with test ...................................................................... add osmo_str_tolower() and _toupper() with test We already have osmo_str2lower() and osmo_str2upper(), but these lack: * proper destination buffer bounds checking, * ability to call directly as printf() argument. Deprecate osmo_str2upper() and osmo_str2lower() because of missing bounds checking. Introduce osmo_str_tolower_buf(), osmo_str_toupper_buf() to provide bounds-safe conversion, also able to safely convert a buffer in-place. Introduce osmo_str_tolower(), osmo_str_toupper() that call the above _buf() equivalents using a static buffer[128] and returning the resulting string directly, convenient for direct printing. Possibly truncated but always safe. Add unit tests to utils_test.c. Replace all libosmocore uses of now deprecated osmo_str2lower(). Naming: the ctype.h API is called tolower() and toupper(), so just prepend 'osmo_str_' and don't separate 'to_lower'. Change-Id: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 --- M include/osmocom/core/utils.h M src/utils.c M src/vty/logging_vty.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 333 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 976d4a8..0b54c88 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -7,6 +7,7 @@ #include #include #include +#include /*! \defgroup utils General-purpose utility functions * @{ @@ -57,8 +58,18 @@ #define osmo_static_assert(exp, name) typedef int dummy##name [(exp) ? 1 : -1] __attribute__((__unused__)); -void osmo_str2lower(char *out, const char *in); -void osmo_str2upper(char *out, const char *in); +void osmo_str2lower(char *out, const char *in) + OSMO_DEPRECATED("Use osmo_str_tolower() or osmo_str_tolower_buf() instead," + " to properly check target memory bounds"); +void osmo_str2upper(char *out, const char *in) + OSMO_DEPRECATED("Use osmo_str_toupper() or osmo_str_toupper_buf() instead," + " to properly check target memory bounds"); + +size_t osmo_str_tolower_buf(char *dest, size_t dest_len, const char *src); +const char *osmo_str_tolower(const char *src); + +size_t osmo_str_toupper_buf(char *dest, size_t dest_len, const char *src); +const char *osmo_str_toupper(const char *src); #define OSMO_SNPRINTF_RET(ret, rem, offset, len) \ do { \ diff --git a/src/utils.c b/src/utils.c index 3f40f2e..e6adcf8 100644 --- a/src/utils.c +++ b/src/utils.c @@ -638,4 +638,90 @@ return g0; } +/*! Convert a string to lowercase, while checking buffer size boundaries. + * The result written to \a dest is guaranteed to be nul terminated if \a dest_len > 0. + * If dest == src, the string is converted in-place, if necessary truncated at dest_len - 1 characters + * length as well as nul terminated. + * Note: similar osmo_str2lower(), but safe to use for src strings of arbitrary length. + * \param[out] dest Target buffer to write lowercase string. + * \param[in] dest_len Maximum buffer size of dest (e.g. sizeof(dest)). + * \param[in] src String to convert to lowercase. + * \returns Length of \a src, like osmo_strlcpy(), but if \a dest == \a src at most \a dest_len - 1. + */ +size_t osmo_str_tolower_buf(char *dest, size_t dest_len, const char *src) +{ + size_t rc; + if (dest == src) { + if (dest_len < 1) + return 0; + dest[dest_len - 1] = '\0'; + rc = strlen(dest); + } else { + if (dest_len < 1) + return strlen(src); + rc = osmo_strlcpy(dest, src, dest_len); + } + for (; *dest; dest++) + *dest = tolower(*dest); + return rc; +} + +/*! Convert a string to lowercase, using a static buffer. + * The resulting string may be truncated if the internally used static buffer is shorter than src. + * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a + * terminating nul. + * See also osmo_str_tolower_buf(). + * \param[in] src String to convert to lowercase. + * \returns Resulting lowercase string in a static buffer, always nul terminated. + */ +const char *osmo_str_tolower(const char *src) +{ + static char buf[128]; + osmo_str_tolower_buf(buf, sizeof(buf), src); + return buf; +} + +/*! Convert a string to uppercase, while checking buffer size boundaries. + * The result written to \a dest is guaranteed to be nul terminated if \a dest_len > 0. + * If dest == src, the string is converted in-place, if necessary truncated at dest_len - 1 characters + * length as well as nul terminated. + * Note: similar osmo_str2upper(), but safe to use for src strings of arbitrary length. + * \param[out] dest Target buffer to write uppercase string. + * \param[in] dest_len Maximum buffer size of dest (e.g. sizeof(dest)). + * \param[in] src String to convert to uppercase. + * \returns Length of \a src, like osmo_strlcpy(), but if \a dest == \a src at most \a dest_len - 1. + */ +size_t osmo_str_toupper_buf(char *dest, size_t dest_len, const char *src) +{ + size_t rc; + if (dest == src) { + if (dest_len < 1) + return 0; + dest[dest_len - 1] = '\0'; + rc = strlen(dest); + } else { + if (dest_len < 1) + return strlen(src); + rc = osmo_strlcpy(dest, src, dest_len); + } + for (; *dest; dest++) + *dest = toupper(*dest); + return rc; +} + +/*! Convert a string to uppercase, using a static buffer. + * The resulting string may be truncated if the internally used static buffer is shorter than src. + * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a + * terminating nul. + * See also osmo_str_toupper_buf(). + * \param[in] src String to convert to uppercase. + * \returns Resulting uppercase string in a static buffer, always nul terminated. + */ +const char *osmo_str_toupper(const char *src) +{ + static char buf[128]; + osmo_str_toupper_buf(buf, sizeof(buf), src); + return buf; +} + /*! @} */ diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 8c8a332..7d97bb1 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -754,7 +754,6 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt) { int i; - char level_lower[32]; switch (tgt->type) { case LOG_TGT_TYPE_VTY: @@ -806,21 +805,19 @@ VTY_NEWLINE); /* stupid old osmo logging API uses uppercase strings... */ - osmo_str2lower(level_lower, log_level_str(tgt->loglevel)); - vty_out(vty, " logging level all %s%s", level_lower, VTY_NEWLINE); + vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), + VTY_NEWLINE); for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; - char cat_lower[32]; /* skip empty entries in the array */ if (!osmo_log_info->cat[i].name) continue; /* stupid old osmo logging API uses uppercase strings... */ - osmo_str2lower(cat_lower, osmo_log_info->cat[i].name+1); - osmo_str2lower(level_lower, log_level_str(cat->loglevel)); - vty_out(vty, " logging level %s %s%s", cat_lower, level_lower, VTY_NEWLINE); + vty_out(vty, " logging level %s", osmo_str_tolower(osmo_log_info->cat[i].name+1)); + vty_out(vty, " %s%s", osmo_str_tolower(log_level_str(cat->loglevel)), VTY_NEWLINE); } return 1; diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index 2f1e87d..2bb1f9c 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -616,6 +616,189 @@ } } +struct osmo_str_tolowupper_test_data { + const char *in; + bool use_static_buf; + size_t buflen; + const char *expect_lower; + const char *expect_upper; + size_t expect_rc; + size_t expect_rc_inplace; +}; + +struct osmo_str_tolowupper_test_data osmo_str_tolowupper_tests[] = { + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .use_static_buf = true, + .expect_lower = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()", + .expect_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 99, + .expect_lower = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()", + .expect_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .expect_rc = 62, + .expect_rc_inplace = 62, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 0, + .expect_lower = "Unset", + .expect_upper = "Unset", + .expect_rc = 62, + .expect_rc_inplace = 0, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 1, + .expect_lower = "", + .expect_upper = "", + .expect_rc = 62, + .expect_rc_inplace = 0, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 2, + .expect_lower = "a", + .expect_upper = "A", + .expect_rc = 62, + .expect_rc_inplace = 1, + }, + { + .in = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", + .buflen = 28, + .expect_lower = "abcdefghijklmnopqrstuvwxyza", + .expect_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZA", + .expect_rc = 62, + .expect_rc_inplace = 27, + }, +}; + + +static void osmo_str_tolowupper_test() +{ + int i; + char buf[128]; + bool ok = true; + printf("\n%s\n", __func__); + + for (i = 0; i < ARRAY_SIZE(osmo_str_tolowupper_tests); i++) { + struct osmo_str_tolowupper_test_data *d = &osmo_str_tolowupper_tests[i]; + size_t rc = 0; + const char *res; + + /* tolower */ + if (d->use_static_buf) { + res = osmo_str_tolower(d->in); + printf("osmo_str_tolower(%s)\n", osmo_quote_str(d->in, -1)); + printf(" = %s\n", osmo_quote_str(res, -1)); + } else { + OSMO_ASSERT(sizeof(buf) >= d->buflen); + osmo_strlcpy(buf, "Unset", sizeof(buf)); + rc = osmo_str_tolower_buf(buf, d->buflen, d->in); + res = buf; + printf("osmo_str_tolower_buf(%zu, %s)\n", d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + } + + if (strcmp(res, d->expect_lower)) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_lower, -1)); + ok = false; + } + + if (!d->use_static_buf && d->expect_rc != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower\n" + " got rc=%zu, expected rc=%zu\n", i, rc, d->expect_rc); + ok = false; + } + + /* tolower, in-place */ + if (!d->use_static_buf) { + osmo_strlcpy(buf, + d->buflen ? d->in : "Unset", + sizeof(buf)); + rc = osmo_str_tolower_buf(buf, d->buflen, buf); + res = buf; + printf("osmo_str_tolower_buf(%zu, %s, in-place)\n", + d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + + if (strcmp(res, d->expect_lower)) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower in-place\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_lower, -1)); + ok = false; + } + + if (d->expect_rc_inplace != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] tolower in-place\n" + " got rc=%zu, expected rc=%zu\n", + i, rc, d->expect_rc_inplace); + ok = false; + } + } + + /* toupper */ + if (d->use_static_buf) { + res = osmo_str_toupper(d->in); + printf("osmo_str_toupper(%s)\n", osmo_quote_str(d->in, -1)); + printf(" = %s\n", osmo_quote_str(res, -1)); + } else { + OSMO_ASSERT(sizeof(buf) >= d->buflen); + osmo_strlcpy(buf, "Unset", sizeof(buf)); + rc = osmo_str_toupper_buf(buf, d->buflen, d->in); + res = buf; + printf("osmo_str_toupper_buf(%zu, %s)\n", d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + } + + if (strcmp(res, d->expect_upper)) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_upper, -1)); + ok = false; + } + + if (!d->use_static_buf && d->expect_rc != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper\n" + " got rc=%zu, expected rc=%zu\n", i, rc, d->expect_rc); + ok = false; + } + + /* toupper, in-place */ + if (!d->use_static_buf) { + osmo_strlcpy(buf, + d->buflen ? d->in : "Unset", + sizeof(buf)); + rc = osmo_str_toupper_buf(buf, d->buflen, buf); + res = buf; + printf("osmo_str_toupper_buf(%zu, %s, in-place)\n", + d->buflen, osmo_quote_str(d->in, -1)); + printf(" = %zu, %s\n", rc, osmo_quote_str(res, -1)); + + if (strcmp(res, d->expect_upper)) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper in-place\n" + " got %s\n", i, osmo_quote_str(res, -1)); + printf(" expected %s\n", osmo_quote_str(d->expect_upper, -1)); + ok = false; + } + + if (d->expect_rc_inplace != rc) { + printf("ERROR: osmo_str_tolowupper_test[%d] toupper in-place\n" + " got rc=%zu, expected rc=%zu\n", + i, rc, d->expect_rc_inplace); + ok = false; + } + } + } + + OSMO_ASSERT(ok); +} + + int main(int argc, char **argv) { static const struct log_info log_info = {}; @@ -631,5 +814,6 @@ str_quote_test(); isqrt_test(); osmo_sockaddr_to_str_and_uint_test(); + osmo_str_tolowupper_test(); return 0; } diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index abc7317..3ea8ec6 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -153,3 +153,49 @@ [5] 234.23.42.123:1234 (omit addr) addr_len=0 --> :1234 rc=0 [6] 234.23.42.123:1234 addr_len=0 --> :1234 rc=13 [7] 234.23.42.123:1234 (omit addr) (omit port) addr_len=0 --> :0 rc=0 + +osmo_str_tolowupper_test +osmo_str_tolower("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()" +osmo_str_toupper("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()" +osmo_str_tolower_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()" +osmo_str_tolower_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 62, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz!@#$%^&*()" +osmo_str_toupper_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()" +osmo_str_toupper_buf(99, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()" +osmo_str_tolower_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "Unset" +osmo_str_tolower_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "Unset" +osmo_str_toupper_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "Unset" +osmo_str_toupper_buf(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "Unset" +osmo_str_tolower_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "" +osmo_str_tolower_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "" +osmo_str_toupper_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "" +osmo_str_toupper_buf(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 0, "" +osmo_str_tolower_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "a" +osmo_str_tolower_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 1, "a" +osmo_str_toupper_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "A" +osmo_str_toupper_buf(2, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 1, "A" +osmo_str_tolower_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "abcdefghijklmnopqrstuvwxyza" +osmo_str_tolower_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 27, "abcdefghijklmnopqrstuvwxyza" +osmo_str_toupper_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()") + = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZA" +osmo_str_toupper_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) + = 27, "ABCDEFGHIJKLMNOPQRSTUVWXYZA" -- To view, visit https://gerrit.osmocom.org/10830 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: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 Gerrit-Change-Number: 10830 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 Sep 7 09:06:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:06:37 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO outgoing: fix L3 forwarding In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10809 ) Change subject: inter-BSC HO outgoing: fix L3 forwarding ...................................................................... Patch Set 1: Code-Review+1 agreeing with vadim -- To view, visit https://gerrit.osmocom.org/10809 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: Ice37242c90c19adbf0795618fd16fe75f0809317 Gerrit-Change-Number: 10809 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Sep 2018 09: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 Fri Sep 7 09:07:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:07:09 +0000 Subject: Change in osmo-bsc[master]: SCCPlite Assignment Complete: include Speech Codec (Chosen) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10810 ) Change subject: SCCPlite Assignment Complete: include Speech Codec (Chosen) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10810 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: Ibedade8d71a7994d25a63bc2faa2a24a10bfffa1 Gerrit-Change-Number: 10810 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:07: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 Sep 7 09:07:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:07:30 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: send BSSMAP HO Complete directly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10811 ) Change subject: inter-BSC HO incoming: send BSSMAP HO Complete directly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10811 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: Ic48ae2bb23565015d5e2ccb56308fad09347b51a Gerrit-Change-Number: 10811 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:07: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 Sep 7 09:09:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:09:48 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix full system upgrade In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10812 ) Change subject: gr-gsm-master/Dockerfile: fix full system upgrade ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10812 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: Icb3ccb9a9531686efcebb3e277421c4c05387b09 Gerrit-Change-Number: 10812 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 07 Sep 2018 09: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 Fri Sep 7 09:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:10:05 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10813 ) Change subject: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10813 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: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa Gerrit-Change-Number: 10813 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 07 Sep 2018 09:10: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 Sep 7 09:10:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:10:16 +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 5: 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: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 07 Sep 2018 09: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 Fri Sep 7 09:10:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:10:19 +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 5: 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: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:10: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 Sep 7 09:10:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 09:10:40 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix full system upgrade In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10812 ) Change subject: gr-gsm-master/Dockerfile: fix full system upgrade ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10812 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: Icb3ccb9a9531686efcebb3e277421c4c05387b09 Gerrit-Change-Number: 10812 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Sep 2018 09:10:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 09:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 09:10:44 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10813 ) Change subject: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10813 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: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa Gerrit-Change-Number: 10813 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Sep 2018 09:10:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 09:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 09:10:48 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix full system upgrade In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10812 ) Change subject: gr-gsm-master/Dockerfile: fix full system upgrade ...................................................................... gr-gsm-master/Dockerfile: fix full system upgrade Thanks to Piotr, it was discovered that the image building process fails during full system upgrade: RUN pacman -Syu with the following output: looking for conflicting packages... Packages (2) ca-certificates-mozilla-* p11-kit-* ... :: Proceed with installation? [Y/n] The command '/bin/sh -c pacman -Syu' returned a non-zero code: 1 Looks like the '--noconfirm' flag was missing. Change-Id: Icb3ccb9a9531686efcebb3e277421c4c05387b09 --- M gr-gsm-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index e75d318..8be1a20 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -17,7 +17,7 @@ gcc # Sync pacman -RUN pacman -Syu +RUN pacman -Syyu --noconfirm # Install persistent packages RUN pacman -S --needed --noconfirm \ -- To view, visit https://gerrit.osmocom.org/10812 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: Icb3ccb9a9531686efcebb3e277421c4c05387b09 Gerrit-Change-Number: 10812 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 Fri Sep 7 09:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 09:10:48 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10813 ) Change subject: gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm ...................................................................... gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm All required changes from 'fixeria/trx' have been merged. Change-Id: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa --- M gr-gsm-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 8be1a20..813b66b 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Vadim Yanitskiy ARG LIBOSMOCORE_BRANCH="master" -ARG GR_GSM_BRANCH="fixeria/trx" +ARG GR_GSM_BRANCH="master" # Build dependencies ENV BUILD_DEPS \ -- To view, visit https://gerrit.osmocom.org/10813 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: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa Gerrit-Change-Number: 10813 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 Fri Sep 7 09:10:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:10:57 +0000 Subject: Change in osmo-bsc[master]: codec_pref.c: Add comment in expected switch case without break In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10775 ) Change subject: codec_pref.c: Add comment in expected switch case without break ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10775 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: I568353f070f049003326306106dce89b35deb92f Gerrit-Change-Number: 10775 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 09:10: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 Sep 7 09:10:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 09:10:59 +0000 Subject: Change in osmo-bsc[master]: codec_pref.c: Add comment in expected switch case without break In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10775 ) Change subject: codec_pref.c: Add comment in expected switch case without break ...................................................................... codec_pref.c: Add comment in expected switch case without break Change-Id: I568353f070f049003326306106dce89b35deb92f --- M src/osmo-bsc/codec_pref.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index cbe8ef4..2a9be6e 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -44,6 +44,7 @@ break; case GSM0808_PERM_HR2: LOGP(DMSC, LOGL_FATAL, "Speech HR2 was never specified!\n"); + /* fall through */ default: LOGP(DMSC, LOGL_FATAL, "Unsupported permitted speech %s selected, " "assuming AMR as channel mode...\n", -- To view, visit https://gerrit.osmocom.org/10775 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: I568353f070f049003326306106dce89b35deb92f Gerrit-Change-Number: 10775 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 Sep 7 12:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 12:17:26 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10831 Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... apps/grgsm_trx: fix inaccurate sample rate calculation Change-Id: I0c309588fa0f7822abfb3919327639735db07679 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/31/10831/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 45312e6..6efed07 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -46,7 +46,7 @@ base_port = 6700 # PHY specific - phy_sample_rate = 4 * 1625000 / 6 + phy_sample_rate = radio_if.SAMPLE_RATE phy_freq_offset_hz = None phy_tx_antenna = "TX/RX" phy_rx_antenna = "RX2" diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 407e724..2aeb49a 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -75,6 +75,9 @@ GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) + # TODO: explain where do these values come from? + SAMPLE_RATE = 4.0 * 1625000.0 / 6.0 + # FIXME: shall be measured (automatically?) for # particular device and particular clock rate. # The current value is measured for USRP B2X0 at 26e6. -- To view, visit https://gerrit.osmocom.org/10831 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: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 12:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 12:17:26 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10832 Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... apps/grgsm_trx: migrate from getopt to argparse Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d --- M apps/grgsm_trx 1 file changed, 69 insertions(+), 106 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/32/10832/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 6efed07..d57c979 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -4,6 +4,7 @@ # GR-GSM based transceiver # # (C) 2016-2018 by Vadim Yanitskiy +# (C) 2017-2018 by Piotr Krysik # # All Rights Reserved # @@ -22,9 +23,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import signal -import getopt import sys +from argparse import ArgumentParser +from argparse import ArgumentTypeError from gnuradio import eng_notation from grgsm.trx import ctrl_if_bb @@ -33,31 +35,25 @@ COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ - "Copyright (C) 2017 by Piotr Krysik \n" \ + "Copyright (C) 2017-2018 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" \ "There is NO WARRANTY, to the extent permitted by law.\n" class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 6700 - - # PHY specific - phy_sample_rate = radio_if.SAMPLE_RATE - phy_freq_offset_hz = None - phy_tx_antenna = "TX/RX" - phy_rx_antenna = "RX2" - phy_rx_gain = 30 - phy_tx_gain = 10 - phy_args = "" - phy_ppm = 0 - - def __init__(self): - self.print_copyright() - self.parse_argv() + def __init__(self, argv): + self.remote_addr = argv.remote_addr + self.bind_addr = argv.bind_addr + self.base_port = argv.base_port + self.phy_args = argv.args + self.phy_sample_rate = argv.sample_rate + self.phy_rx_gain = argv.rx_gain + self.phy_tx_gain = argv.tx_gain + self.phy_rx_antenna = argv.rx_antenna + self.phy_tx_antenna = argv.tx_antenna + self.phy_freq_offset_hz = argv.freq_offset + self.phy_ppm = argv.ppm # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -95,97 +91,64 @@ print("[i] Shutting down...") self.radio.shutdown() - def print_copyright(self): - print(COPYRIGHT) - - def print_help(self): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - # 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 - 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 %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" \ - " --freq-offset Shift baseband freq. (e.g. -500M)\n" \ - " --ppm Set frequency correction (default %d)\n" - - print(s % ( - self.remote_addr, - self.bind_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: - opts, args = getopt.getopt(sys.argv[1:], - "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=", "freq-offset="]) - except getopt.GetoptError as err: - # Print(help and exit) - self.print_help() - print("[!] " + str(err)) - sys.exit(2) - - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) - - # 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) - else: - print("[!] The port number should be in range [0-65536]") - sys.exit(2) - - # PHY specific - elif o in ("-a", "--device-args"): - self.phy_args = v - elif o in ("-s", "--sample-rate"): - self.phy_sample_rate = int(v) - elif o in ("-g", "--rx-gain"): - self.phy_rx_gain = int(v) - elif o in ("-G", "--tx-gain"): - self.phy_tx_gain = int(v) - elif o in ("--rx-antenna"): - self.phy_rx_antenna = v - elif o in ("--tx-antenna"): - self.phy_tx_antenna = v - elif o in ("--ppm"): - self.phy_ppm = int(v) - elif o in ("--freq-offset"): - # Convert /\d+(\.\d+)?(M|k)?/ to Hz - offset_hz = eng_notation.str_to_num(v) - self.phy_freq_offset_hz = offset_hz - def sig_handler(self, signum, frame): print("Signal %d received" % signum) if signum is signal.SIGINT: self.shutdown() sys.exit(0) +def eng_float(value): + try: + return eng_notation.str_to_num(value) + except: + raise ArgumentTypeError("invalid engineering notation " + "value: {0}".format(value)) + +def parse_argv(): + parser = ArgumentParser(prog = "grgsm_trx") + + # TRX interface specific + parser.add_argument("-i", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + parser.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + parser.add_argument("-p", "--base_port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + + # PHY specific + parser.add_argument("-a", "--args", + dest = "args", type = str, default = "", + help = "Set device arguments") + parser.add_argument("-s", "--sample-rate", + dest = "sample_rate", type = eng_float, + default = radio_if.SAMPLE_RATE, + help = "Set samp_rate (default %(default)s)") + parser.add_argument("-g", "--rx-gain", + dest = "rx_gain", type = float, default = 30, + help = "Set RX gain (default %(default)s)") + parser.add_argument("-G", "--tx-gain", + dest = "tx_gain", type = float, default = 10, + help = "Set TX gain (default %(default)s)") + parser.add_argument("--rx-antenna", + dest = "rx_antenna", type = str, default = "RX2", + help = "Set RX antenna (default %(default)s)") + parser.add_argument("--tx-antenna", + dest = "tx_antenna", type = str, default = "TX/RX", + help = "Set TX antenna (default %(default)s)") + parser.add_argument("--freq-offset", + dest = "freq_offset", type = eng_float, default = 0, + help = "Shift baseband freq. (e.g. -500M)") + parser.add_argument("--ppm", + dest = "ppm", type = float, default = 0, + help = "Set frequency correction (default %(default)s)") + + return parser.parse_args() + if __name__ == '__main__': - app = Application() + print(COPYRIGHT) + argv = parse_argv() + app = Application(argv) app.run() -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 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 Sep 7 12:28:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 12:28:19 +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 ...................................................................... Set Ready For Review -- 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: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 12:28:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 13:38:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 13:38:05 +0000 Subject: Change in openbsc[master]: systemd: describe osmo-bsc-sccplite service as legacy Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10833 Change subject: systemd: describe osmo-bsc-sccplite service as legacy ...................................................................... systemd: describe osmo-bsc-sccplite service as legacy Change-Id: I88ba349e547c8f85e12e1ad80a2724086c489c02 --- M openbsc/contrib/systemd/osmo-bsc-sccplite.service 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/33/10833/1 diff --git a/openbsc/contrib/systemd/osmo-bsc-sccplite.service b/openbsc/contrib/systemd/osmo-bsc-sccplite.service index 70cda5f..3edd35c 100644 --- a/openbsc/contrib/systemd/osmo-bsc-sccplite.service +++ b/openbsc/contrib/systemd/osmo-bsc-sccplite.service @@ -1,5 +1,5 @@ [Unit] -Description=OpenBSC BSC +Description=OpenBSC BSC (legacy, with SCCPLite) Wants=osmo-bsc-mgcp.service [Service] -- To view, visit https://gerrit.osmocom.org/10833 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: I88ba349e547c8f85e12e1ad80a2724086c489c02 Gerrit-Change-Number: 10833 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 Sep 7 14:13:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:13:08 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( 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. Cosmetic: use strcmp(), not strncmp(). In the presence of a terminating nul as we can assume here, this makes no functional difference, but it clarifies the code. Related: OS#3508 Depends: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 (libosmocore) 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, 49 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 0126c7c..0918b8b 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -189,9 +189,18 @@ struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id) { struct mgcp_conn *conn; + const char *id_upper; + + 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. */ + id_upper = osmo_str_toupper(id); llist_for_each_entry(conn, &endp->conns, entry) { - if (strncmp(conn->id, id, sizeof(conn->id)) == 0) + if (strcmp(conn->id, id_upper) == 0) return conn; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index c40eabc..99ddd71 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1751,6 +1751,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"); @@ -1775,6 +1809,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 ddda751..f50f487 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1169,4 +1169,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: merged Gerrit-Change-Id: I8e52278c3abe9e9c8c848c2b1538bce443f68a43 Gerrit-Change-Number: 10677 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 Fri Sep 7 14:13:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:13:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): match conn Id ('I:') despite leading zeros In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( 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. Now, mgcp_conn_get() would match a valid id with *any* amount of leading zeros, even if that far surpasses the permitted conn id length. Valid lengths of incoming conn ids should be and is checked elsewhere. 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(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 0918b8b..820c63a 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -190,17 +190,25 @@ { struct mgcp_conn *conn; const char *id_upper; + const char *conn_id; 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. */ id_upper = osmo_str_toupper(id); llist_for_each_entry(conn, &endp->conns, entry) { - if (strcmp(conn->id, id_upper) == 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 99ddd71..b9f7253 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1759,8 +1759,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 f50f487..28e9aad 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1171,6 +1171,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: merged Gerrit-Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 Gerrit-Change-Number: 10678 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 Fri Sep 7 14:13:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:13:10 +0000 Subject: Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index b9f7253..4cb16dd 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -607,47 +607,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: merged Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b Gerrit-Change-Number: 10679 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 Fri Sep 7 14:13:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:13:10 +0000 Subject: Change in osmo-mgw[master]: comment: indicate struct type for mgcp_endpoint.conns In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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: merged Gerrit-Change-Id: Ia65359c22da3e7b28e3f23b36446ca434ca0be8c Gerrit-Change-Number: 10680 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 Fri Sep 7 14:15:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:15:46 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... Patch Set 1: we often use 'remote-ip', but this one here is not limited to an IP, but could also be a hostname ... 'gsmtap-remote-host' then? -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 07 Sep 2018 14:15:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:34:58 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO outgoing: fix L3 forwarding In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10809 to look at the new patch set (#2). Change subject: inter-BSC HO outgoing: fix L3 forwarding ...................................................................... inter-BSC HO outgoing: fix L3 forwarding Set msgb->l3h when composing the L3 message. Before this, the unset l3h resulted in erratic size in the RSL L3 Info IE. This likely fixes inter-BSC Handover on the outgoing side, to properly forward the RR Handover Command. Change-Id: Ice37242c90c19adbf0795618fd16fe75f0809317 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/10809/2 -- To view, visit https://gerrit.osmocom.org/10809 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: Ice37242c90c19adbf0795618fd16fe75f0809317 Gerrit-Change-Number: 10809 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr 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 Fri Sep 7 14:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:34:59 +0000 Subject: Change in osmo-bsc[master]: ho fsm: handle RR HO Failure for inter-BSC outgoing Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10834 Change subject: ho fsm: handle RR HO Failure for inter-BSC outgoing ...................................................................... ho fsm: handle RR HO Failure for inter-BSC outgoing Before, this would ignore the failure and hit a timeout instead. Rather handle the event directly. Change-Id: I21c43d2907d0413ef18ec43cf27f680ebecf9e82 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/10834/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index a42f10c..9d558bc 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1025,6 +1025,18 @@ } } +static void ho_out_fsm_wait_clear(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_subscriber_connection *conn = ho_fi_conn(fi); + switch (event) { + case HO_EV_RR_HO_FAIL: + ho_fail(HO_RESULT_FAIL_RR_HO_FAIL, "Received RR Handover Failure message"); + return; + + default: + OSMO_ASSERT(false); + } +} #define S(x) (1 << (x)) @@ -1108,6 +1120,10 @@ }, [HO_OUT_ST_WAIT_CLEAR] = { .name = "inter-BSC-OUT:WAIT_CLEAR", + .in_event_mask = 0 + | S(HO_EV_RR_HO_FAIL) + , + .action = ho_out_fsm_wait_clear, }, }; -- To view, visit https://gerrit.osmocom.org/10834 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: I21c43d2907d0413ef18ec43cf27f680ebecf9e82 Gerrit-Change-Number: 10834 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:34:59 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: allow late RTP release events without erroring Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10835 Change subject: lchan_fsm: allow late RTP release events without erroring ...................................................................... lchan_fsm: allow late RTP release events without erroring Change-Id: Ia463f97402b957bd13a95d18d291d1c1f006f089 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/10835/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 7d47380..1ef7869 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -967,6 +967,10 @@ lchan_fsm_state_chg(LCHAN_ST_UNUSED); break; + case LCHAN_EV_RTP_RELEASED: + /* ignore late lchan_rtp_fsm release events */ + return; + default: OSMO_ASSERT(false); } @@ -1119,6 +1123,7 @@ .name = "WAIT_BEFORE_RF_RELEASE", .in_event_mask = 0 | S(LCHAN_EV_RLL_REL_IND) /* allow late REL_IND of SAPI[0] */ + | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) @@ -1131,6 +1136,7 @@ .action = lchan_fsm_wait_rf_release_ack, .in_event_mask = 0 | S(LCHAN_EV_RSL_RF_CHAN_REL_ACK) + | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) @@ -1140,6 +1146,9 @@ }, [LCHAN_ST_WAIT_AFTER_ERROR] = { .name = "WAIT_AFTER_ERROR", + .in_event_mask = 0 + | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ + , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) , -- To view, visit https://gerrit.osmocom.org/10835 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: Ia463f97402b957bd13a95d18d291d1c1f006f089 Gerrit-Change-Number: 10835 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:38:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:38:22 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... Patch Set 1: > we often use 'remote-ip', but this one here is not limited to an > IP, but could also be a hostname ... 'gsmtap-remote-host' then? gsmtap-dst-host ? -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:38:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:42:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:42:47 +0000 Subject: Change in osmo-bsc[master]: SCCPlite Assignment Complete: include Speech Codec (Chosen) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10810 ) Change subject: SCCPlite Assignment Complete: include Speech Codec (Chosen) ...................................................................... SCCPlite Assignment Complete: include Speech Codec (Chosen) Compose the Speech Codec (Chosen) IE not only for AoIP, but also for SCCPlite: place the code that assigns the codec to sc_ptr outside of the gscon_is_aoip() if scope. This way the MSC is told the chosen speech codec, which is mandatory for IP based user plane, and was missing until now. Related: OS#3528 Change-Id: Ibedade8d71a7994d25a63bc2faa2a24a10bfffa1 --- M src/osmo-bsc/assignment_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/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index e1da45b..63776f0 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -163,12 +163,12 @@ return; } addr_local_p = &addr_local; - - /* Extrapolate speech codec from speech mode */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ } + + /* Extrapolate speech codec from speech mode */ /* FIXME: AMR codec configuration must be derived from lchan1! */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ } resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, -- To view, visit https://gerrit.osmocom.org/10810 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: Ibedade8d71a7994d25a63bc2faa2a24a10bfffa1 Gerrit-Change-Number: 10810 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 Sep 7 14:42:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:42:48 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: send BSSMAP HO Complete directly In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10811 ) Change subject: inter-BSC HO incoming: send BSSMAP HO Complete directly ...................................................................... inter-BSC HO incoming: send BSSMAP HO Complete directly Before Handover is fully completed, the gscon remains in an INIT state. To send back the BSSMAP Handover Complete message, use osmo_bsc_sigtran_send() directly to not thwart the message due to the gscon state. (The gscon state will change to ACTIVE right after that, once the handover FSM is done.) Change-Id: Ic48ae2bb23565015d5e2ccb56308fad09347b51a --- 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 03e073a..d6b0b6d 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1100,7 +1100,7 @@ return HO_RESULT_ERROR; } - rc = gscon_sigtran_send(conn, msg); + rc = osmo_bsc_sigtran_send(conn, msg); if (rc) { LOG_HO(conn, LOGL_ERROR, "Cannot send BSSMAP Handover Complete message\n"); return HO_RESULT_ERROR; -- To view, visit https://gerrit.osmocom.org/10811 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: Ic48ae2bb23565015d5e2ccb56308fad09347b51a Gerrit-Change-Number: 10811 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 Fri Sep 7 14:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:10 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10836 Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp Since osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc those have been removed entirely from the repo and are only available trhough openbsc.git. Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 3 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/36/10836/1 diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index b083a9c..19e17ab 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -3,35 +3,22 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libosmocore libosmo-netif bcg729 libgsm" +DEPENDS = "libosmocore libosmo-netif" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -EXTRA_OECONF += "--enable-mgcp-transcoding --with-g729" - do_install_append() { install -d ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ } -PACKAGES =+ " libosmo-legacy-mgcp libosmo-legacy-mgcp-dev libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev osmo-bsc-mgcp" +PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" - -FILES_libosmo-legacy-mgcp = "${libdir}/libosmo-legacy-mgcp${SOLIBS}" -FILES_libosmo-legacy-mgcp-dev = " \ - ${includedir}/osmocom/legacy_mgcp \ - ${libdir}/pkgconfig/libosmo-legacy-mgcp.pc \ - ${libdir}/libosmo-legacy-mgcp${SOLIBSDEV} \ - " FILES_libosmo-mgcp = "${libdir}/libosmo-mgcp${SOLIBS}" FILES_libosmo-mgcp-dev = " \ @@ -47,11 +34,4 @@ ${libdir}/libosmo-mgcp-client${SOLIBSDEV} \ " -FILES_osmo-bsc-mgcp = " \ - ${bindir}/osmo-bsc_mgcp \ - ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_unitdir}/system/osmo-bsc-mgcp.service \ - " -CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" - CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-mgw.cfg" -- To view, visit https://gerrit.osmocom.org/10836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 10836 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 Sep 7 14:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:10 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-sccplite.service from git repo Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10837 Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... openbsc: Install osmo-bsc-sccplite.service from git repo Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service 2 files changed, 2 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/37/10837/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 9f23d52..66782fb 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -8,10 +8,9 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc-sccplite.init \ - file://osmo-bsc-sccplite.service \ " -INC_PR = "r1.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -32,7 +31,7 @@ # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service deleted file mode 100644 index 3edd35c..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenBSC BSC (legacy, with SCCPLite) -Wants=osmo-bsc-mgcp.service - -[Service] -Type=simple -Restart=always -ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s -RestartSec=2 - -[Install] -WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/10837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 10837 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 Sep 7 14:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:10 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-nat service from git repo Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10838 Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... openbsc: Install osmo-bsc-nat service from git repo Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/38/10838/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 66782fb..f76afb7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -20,7 +20,7 @@ install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ + install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -32,6 +32,7 @@ install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom @@ -65,6 +66,7 @@ CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" FILES_osmo-bsc-nat = " \ - ${bindir}/osmo-bsc_nat \ - ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - " + ${bindir}/osmo-bsc_nat \ + ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ + ${systemd_system_unitdir}/osmo-bsc-nat.service \ + " -- To view, visit https://gerrit.osmocom.org/10838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 10838 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 Sep 7 14:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:11 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Use systemd.bbclass correctly Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10839 Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... openbsc: Use systemd.bbclass correctly * Describe packages containing systemd services in SYSTEMD_PACKAGES. * Enable services by default, since now osmo-bsc-sccplite doesn't collide with osmo-bsc.git's osmo-bsc. * Add SYSTEMD_SERVICE_* to specify service file for each package. Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/39/10839/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index f76afb7..ca9a6c6 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -39,13 +39,11 @@ } PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" - +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" -# Do not start any of the services by default -SYSTEMD_AUTO_ENABLE = "disable" - CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" +SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ @@ -55,16 +53,18 @@ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" +SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_unitdir}/system/osmo-nitb.service \ + ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" +SYSTEMD_SERVICE_osmo-bsc-nat = "osmo-bsc-nat.service" FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ -- To view, visit https://gerrit.osmocom.org/10839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 10839 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 Sep 7 14:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:11 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Package osmo-bsc-mgcp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10840 Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... openbsc: Package osmo-bsc-mgcp Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/40/10840/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca9a6c6..ec130db 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -10,7 +10,7 @@ file://osmo-bsc-sccplite.init \ " -INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -21,6 +21,7 @@ install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg + install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -33,13 +34,14 @@ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom } -PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" -SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" +PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" @@ -70,3 +72,11 @@ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ ${systemd_system_unitdir}/osmo-bsc-nat.service \ " + +CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" +SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" +FILES_osmo-bsc-mgcp = " \ + ${bindir}/osmo-bsc_mgcp \ + ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ + ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ + " -- To view, visit https://gerrit.osmocom.org/10840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 10840 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 Sep 7 14:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:11 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10841 Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... osmo-msc: Depend on osmo-hlr Since a while ago, osmo-msc depends on libosmo-gsup-client which is provided by osmo-hlr. Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/41/10841/1 diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index 06f5b10..e5364cd 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" +DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 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 Sep 7 14:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:11 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10842 Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/42/10842/1 diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 7e75d13..8f078ed 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -23,6 +23,20 @@ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" + +FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" +FILES_libosmo-gsup-client-dev = " \ + ${includedir}/osmocom/gsupclient \ + ${libdir}/pkgconfig/libosmo-gsup-client.pc \ + ${libdir}/libosmo-gsup-client${SOLIBSDEV} \ + " + +FILES_osmo-hlr-utils = " \ + ${bindir}/osmo-hlr-db-tool \ + ${bindir}/osmo-euse-demo \ + " + SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-hlr = "\ ${sysconfdir}/osmocom/osmo-hlr.cfg \ -- To view, visit https://gerrit.osmocom.org/10842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 10842 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 Sep 7 14:43:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:43:58 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... Abandoned Abandoned in favour of https://gerrit.osmocom.org/#/c/meta-telephony/+/10836/ -- 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: abandon 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 -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:44:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:44:02 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO outgoing: fix L3 forwarding In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10809 ) Change subject: inter-BSC HO outgoing: fix L3 forwarding ...................................................................... Patch Set 2: Code-Review+2 done, now submitting myself: triviality -- To view, visit https://gerrit.osmocom.org/10809 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: Ice37242c90c19adbf0795618fd16fe75f0809317 Gerrit-Change-Number: 10809 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Sep 2018 14:44: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 Sep 7 14:44:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Sep 2018 14:44:03 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO outgoing: fix L3 forwarding In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10809 ) Change subject: inter-BSC HO outgoing: fix L3 forwarding ...................................................................... inter-BSC HO outgoing: fix L3 forwarding Set msgb->l3h when composing the L3 message. Before this, the unset l3h resulted in erratic size in the RSL L3 Info IE. This likely fixes inter-BSC Handover on the outgoing side, to properly forward the RR Handover Command. Change-Id: Ice37242c90c19adbf0795618fd16fe75f0809317 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 0dd27fd..589d673 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -683,14 +683,13 @@ int rsl_forward_layer3_info(struct gsm_lchan *lchan, const uint8_t *l3_info, uint8_t l3_info_len) { struct msgb *msg; - uint8_t *dst; if (!l3_info || !l3_info_len) return -EINVAL; msg = rsl_msgb_alloc(); - dst = msgb_put(msg, l3_info_len); - memcpy(dst, l3_info, l3_info_len); + msg->l3h = msgb_put(msg, l3_info_len); + memcpy(msg->l3h, l3_info, l3_info_len); msg->lchan = lchan; return rsl_data_request(msg, 0); -- To view, visit https://gerrit.osmocom.org/10809 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: Ice37242c90c19adbf0795618fd16fe75f0809317 Gerrit-Change-Number: 10809 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:44:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:44:10 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10836 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 10836 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:44: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 Sep 7 14:44:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:44:14 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-sccplite.service from git repo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10837 ) Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 10837 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:44:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:44:17 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-nat service from git repo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10838 ) Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 10838 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14: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 Fri Sep 7 14:44:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:44:20 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Use systemd.bbclass correctly In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10839 ) Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 10839 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:44: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 Sep 7 14:44:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:44:23 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Package osmo-bsc-mgcp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10840 ) Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 10840 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:44: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 Sep 7 14:44:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:44:27 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10841 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:44:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 14:45:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 14:45:12 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10842 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 10842 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 14:45:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 7 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 7 Sep 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_#239?= In-Reply-To: <963063463.153.1536246606490.JavaMail.jenkins@jenkins.osmocom.org> References: <963063463.153.1536246606490.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <158065946.171.1536333006589.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_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_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_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 -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 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 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 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 -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 Fri Sep 7 15:13:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:13:54 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-sccplite.service from git repo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10837 ) Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 10837 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:13: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 Sep 7 15:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:14:08 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10836 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 10836 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15: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 Sep 7 15:14:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:14:18 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-nat service from git repo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10838 ) Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 10838 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:14: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 Sep 7 15:14:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:14:30 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Use systemd.bbclass correctly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10839 ) Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 10839 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:14: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 Sep 7 15:14:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:14:36 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Package osmo-bsc-mgcp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10840 ) Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 10840 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:14: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 Sep 7 15:14:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:14:50 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10841 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:14: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 Sep 7 15:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:15:23 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10841 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: -Code-Review actually, I think you should first split the libosmo-gsup-client sub-package and then depend on that? -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:15: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 Sep 7 15:15:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:15:36 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10842 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 10842 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:15: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 Sep 7 15:16:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:16:11 +0000 Subject: Change in osmo-bsc[master]: ho fsm: handle RR HO Failure for inter-BSC outgoing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10834 ) Change subject: ho fsm: handle RR HO Failure for inter-BSC outgoing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10834 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: I21c43d2907d0413ef18ec43cf27f680ebecf9e82 Gerrit-Change-Number: 10834 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 15:16: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 Sep 7 15:16:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:16:22 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: allow late RTP release events without erroring In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10835 ) Change subject: lchan_fsm: allow late RTP release events without erroring ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10835 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: Ia463f97402b957bd13a95d18d291d1c1f006f089 Gerrit-Change-Number: 10835 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 15:16: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 Sep 7 15:18:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:18:06 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... Patch Set 1: > we often use 'remote-ip', but this one here is not limited to an > IP, but could also be a hostname ... 'gsmtap-remote-host' then? while we use "char *" to store the stringified IP address in many places, we still don't do DNS lookups, as those would happen synchronously and block. So actually I'm happy with remote-ip and restricting the string to A.B.C.D style syntax. If there is code that triggers a blcoking DNS, then please flag that as separate bug! -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:18:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 15:24:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 15:24:32 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10841 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: > actually, I think you should first split the libosmo-gsup-client > sub-package and then depend on that? No, afaik you DEPEND on recipes, not on packages. You RDEPEND on packages, but that's done automatically by OE in most cases (through linker analysis). -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15: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 Fri Sep 7 15:32:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:06 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10841 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 15:32:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 15:32:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:07 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10836 ) Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp ...................................................................... osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp Since osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc those have been removed entirely from the repo and are only available trhough openbsc.git. Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 3 insertions(+), 23 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index b083a9c..19e17ab 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -3,35 +3,22 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libosmocore libosmo-netif bcg729 libgsm" +DEPENDS = "libosmocore libosmo-netif" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -EXTRA_OECONF += "--enable-mgcp-transcoding --with-g729" - do_install_append() { install -d ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ } -PACKAGES =+ " libosmo-legacy-mgcp libosmo-legacy-mgcp-dev libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev osmo-bsc-mgcp" +PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" - -FILES_libosmo-legacy-mgcp = "${libdir}/libosmo-legacy-mgcp${SOLIBS}" -FILES_libosmo-legacy-mgcp-dev = " \ - ${includedir}/osmocom/legacy_mgcp \ - ${libdir}/pkgconfig/libosmo-legacy-mgcp.pc \ - ${libdir}/libosmo-legacy-mgcp${SOLIBSDEV} \ - " FILES_libosmo-mgcp = "${libdir}/libosmo-mgcp${SOLIBS}" FILES_libosmo-mgcp-dev = " \ @@ -47,11 +34,4 @@ ${libdir}/libosmo-mgcp-client${SOLIBSDEV} \ " -FILES_osmo-bsc-mgcp = " \ - ${bindir}/osmo-bsc_mgcp \ - ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_unitdir}/system/osmo-bsc-mgcp.service \ - " -CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" - CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-mgw.cfg" -- To view, visit https://gerrit.osmocom.org/10836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1 Gerrit-Change-Number: 10836 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 Sep 7 15:32:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:08 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-sccplite.service from git repo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10837 ) Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo ...................................................................... openbsc: Install osmo-bsc-sccplite.service from git repo Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service 2 files changed, 2 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 9f23d52..66782fb 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -8,10 +8,9 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc-sccplite.init \ - file://osmo-bsc-sccplite.service \ " -INC_PR = "r1.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -32,7 +31,7 @@ # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service deleted file mode 100644 index 3edd35c..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenBSC BSC (legacy, with SCCPLite) -Wants=osmo-bsc-mgcp.service - -[Service] -Type=simple -Restart=always -ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s -RestartSec=2 - -[Install] -WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/10837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb Gerrit-Change-Number: 10837 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 Sep 7 15:32:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:08 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Install osmo-bsc-nat service from git repo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10838 ) Change subject: openbsc: Install osmo-bsc-nat service from git repo ...................................................................... openbsc: Install osmo-bsc-nat service from git repo Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 66782fb..f76afb7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -20,7 +20,7 @@ install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ + install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -32,6 +32,7 @@ install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom @@ -65,6 +66,7 @@ CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" FILES_osmo-bsc-nat = " \ - ${bindir}/osmo-bsc_nat \ - ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - " + ${bindir}/osmo-bsc_nat \ + ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ + ${systemd_system_unitdir}/osmo-bsc-nat.service \ + " -- To view, visit https://gerrit.osmocom.org/10838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5 Gerrit-Change-Number: 10838 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 Sep 7 15:32:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:08 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Use systemd.bbclass correctly In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10839 ) Change subject: openbsc: Use systemd.bbclass correctly ...................................................................... openbsc: Use systemd.bbclass correctly * Describe packages containing systemd services in SYSTEMD_PACKAGES. * Enable services by default, since now osmo-bsc-sccplite doesn't collide with osmo-bsc.git's osmo-bsc. * Add SYSTEMD_SERVICE_* to specify service file for each package. Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index f76afb7..ca9a6c6 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -39,13 +39,11 @@ } PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" - +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" -# Do not start any of the services by default -SYSTEMD_AUTO_ENABLE = "disable" - CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" +SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ @@ -55,16 +53,18 @@ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" +SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_unitdir}/system/osmo-nitb.service \ + ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" +SYSTEMD_SERVICE_osmo-bsc-nat = "osmo-bsc-nat.service" FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ -- To view, visit https://gerrit.osmocom.org/10839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd Gerrit-Change-Number: 10839 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 Sep 7 15:32:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:08 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Package osmo-bsc-mgcp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10840 ) Change subject: openbsc: Package osmo-bsc-mgcp ...................................................................... openbsc: Package osmo-bsc-mgcp Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca9a6c6..ec130db 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -10,7 +10,7 @@ file://osmo-bsc-sccplite.init \ " -INC_PR = "r2.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -21,6 +21,7 @@ install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg + install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -33,13 +34,14 @@ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ install -d ${D}/var/lib/osmocom } -PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" -SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" +PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" @@ -70,3 +72,11 @@ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ ${systemd_system_unitdir}/osmo-bsc-nat.service \ " + +CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" +SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service" +FILES_osmo-bsc-mgcp = " \ + ${bindir}/osmo-bsc_mgcp \ + ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ + ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ + " -- To view, visit https://gerrit.osmocom.org/10840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee Gerrit-Change-Number: 10840 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 Sep 7 15:32:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:09 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: Depend on osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10841 ) Change subject: osmo-msc: Depend on osmo-hlr ...................................................................... osmo-msc: Depend on osmo-hlr Since a while ago, osmo-msc depends on libosmo-gsup-client which is provided by osmo-hlr. Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index 06f5b10..e5364cd 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" +DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -- To view, visit https://gerrit.osmocom.org/10841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9 Gerrit-Change-Number: 10841 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 Sep 7 15:32:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 15:32:09 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10842 ) Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils ...................................................................... osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 7e75d13..8f078ed 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -23,6 +23,20 @@ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" + +FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" +FILES_libosmo-gsup-client-dev = " \ + ${includedir}/osmocom/gsupclient \ + ${libdir}/pkgconfig/libosmo-gsup-client.pc \ + ${libdir}/libosmo-gsup-client${SOLIBSDEV} \ + " + +FILES_osmo-hlr-utils = " \ + ${bindir}/osmo-hlr-db-tool \ + ${bindir}/osmo-euse-demo \ + " + SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-hlr = "\ ${sysconfdir}/osmocom/osmo-hlr.cfg \ -- To view, visit https://gerrit.osmocom.org/10842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff Gerrit-Change-Number: 10842 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 Sep 7 16:41:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 16:41:35 +0000 Subject: Change in openbsc[master]: systemd: describe osmo-bsc-sccplite service as legacy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10833 ) Change subject: systemd: describe osmo-bsc-sccplite service as legacy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10833 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: I88ba349e547c8f85e12e1ad80a2724086c489c02 Gerrit-Change-Number: 10833 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 07 Sep 2018 16:41: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 Sep 7 16:41:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 16:41:39 +0000 Subject: Change in openbsc[master]: systemd: describe osmo-bsc-sccplite service as legacy In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10833 ) Change subject: systemd: describe osmo-bsc-sccplite service as legacy ...................................................................... systemd: describe osmo-bsc-sccplite service as legacy Change-Id: I88ba349e547c8f85e12e1ad80a2724086c489c02 --- M openbsc/contrib/systemd/osmo-bsc-sccplite.service 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/contrib/systemd/osmo-bsc-sccplite.service b/openbsc/contrib/systemd/osmo-bsc-sccplite.service index 70cda5f..3edd35c 100644 --- a/openbsc/contrib/systemd/osmo-bsc-sccplite.service +++ b/openbsc/contrib/systemd/osmo-bsc-sccplite.service @@ -1,5 +1,5 @@ [Unit] -Description=OpenBSC BSC +Description=OpenBSC BSC (legacy, with SCCPLite) Wants=osmo-bsc-mgcp.service [Service] -- To view, visit https://gerrit.osmocom.org/10833 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: I88ba349e547c8f85e12e1ad80a2724086c489c02 Gerrit-Change-Number: 10833 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 Sep 7 16:42:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Sep 2018 16:42:32 +0000 Subject: Change in osmo-trx[master]: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10717 ) Change subject: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp ...................................................................... Patch Set 2: I saw this warning, too. The question is: When was that moved? What kind of compatibility to old UHD versions are we dropping with your proposed patch? -- 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: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 07 Sep 2018 16:42:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 17:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Sep 2018 17:41:45 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 17: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 Sep 7 17:55:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 17:55:58 +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 2: > I saw this warning, too. The question is: When was that moved? > What kind of compatibility to old UHD versions are we dropping with > your proposed patch? With 2nd version of this patch I already posted we don't loose compatibility, since old version will continue to use thread_priority.hpp. -- 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: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 07 Sep 2018 17:55:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 18:21:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 18:21:47 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10843 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/43/10843/1 diff --git a/Makefile.am b/Makefile.am index 3f4de13..7d09259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,16 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc +SUBDIRS = include src tests examples stp doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index c0cc488..af64bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,21 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -122,5 +137,7 @@ stp/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..d6a94e7 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,4 @@ +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + osmo-stp.service +endif diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index b2f8077..2c250b0 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,2 +1,3 @@ +/lib/sytemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service deleted file mode 120000 index 55f37c2..0000000 --- a/debian/osmo-stp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-stp.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index bea0a76..c0c9f0c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static + dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/10843 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: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 Gerrit-Change-Number: 10843 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 Sep 7 18:23:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 18:23:02 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10843 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Following https://www.freedesktop.org/software/systemd/man/daemon.html Tested in my OBS branch that package builds fine and ends up with osmo-stp.service. Once it's reviewed, I plan to do this for all systemd services. -- To view, visit https://gerrit.osmocom.org/10843 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: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 Gerrit-Change-Number: 10843 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Sep 2018 18:23:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 7 18:29:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Sep 2018 18:29:44 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10843 to look at the new patch set (#2). Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/43/10843/2 -- To view, visit https://gerrit.osmocom.org/10843 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: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 Gerrit-Change-Number: 10843 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 7 20:06:28 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:06:28 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b92da55bdea3_1c0c4d068424382e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 150s] No package 'libpcsclite' found [ 150s] simtrace2-remsim.o: In function `main': [ 150s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 150s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 150s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 150s] apdu_dispatch.o: In function `apdu_segment_in': [ 150s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 150s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 150s] collect2: error: ld returned 1 exit status [ 150s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 150s] make[2]: *** [simtrace2-remsim] Error 1 [ 150s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 150s] Makefile:20: recipe for target 'utils' failed [ 150s] make[1]: *** [utils] Error 2 [ 150s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 150s] dh_auto_build: make -j1 returned exit code 2 [ 150s] debian/rules:4: recipe for target 'build' failed [ 150s] make: *** [build] Error 2 [ 150s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 150s] [ 150s] lamb55 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:06:12 UTC 2018. [ 150s] [ 150s] ### VM INTERACTION START ### [ 153s] [ 138.894968] sysrq: SysRq : Power Off [ 153s] [ 138.901052] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] lamb55 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:06:15 UTC 2018. [ 153s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:12:11 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:12:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b92dba0cf1c1_1c0c4d06842471d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 141s] No package 'libpcsclite' found [ 141s] simtrace2-remsim.o: In function `main': [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 141s] apdu_dispatch.o: In function `apdu_segment_in': [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 141s] collect2: error: ld returned 1 exit status [ 141s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 141s] make[2]: *** [simtrace2-remsim] Error 1 [ 141s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 141s] Makefile:20: recipe for target 'utils' failed [ 141s] make[1]: *** [utils] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] dh_auto_build: make -j1 returned exit code 2 [ 141s] debian/rules:4: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 141s] [ 141s] build70 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:11:58 UTC 2018. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 133.326777] sysrq: SysRq : Power Off [ 144s] [ 133.329218] reboot: Power down [ 144s] ### VM INTERACTION END ### [ 144s] [ 144s] build70 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:12:02 UTC 2018. [ 144s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:14:11 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:14:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b92dc162898b_1c0c4d06842475ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 155s] No package 'libpcsclite' found [ 155s] simtrace2-remsim.o: In function `main': [ 155s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 155s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 155s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 155s] apdu_dispatch.o: In function `apdu_segment_in': [ 155s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 155s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 155s] collect2: error: ld returned 1 exit status [ 155s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 155s] make[2]: *** [simtrace2-remsim] Error 1 [ 155s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 155s] Makefile:20: recipe for target 'utils' failed [ 155s] make[1]: *** [utils] Error 2 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 155s] dh_auto_build: make -j1 returned exit code 2 [ 155s] debian/rules:4: recipe for target 'build' failed [ 155s] make: *** [build] Error 2 [ 155s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 155s] [ 155s] lamb18 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:13:58 UTC 2018. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 146.564970] sysrq: SysRq : Power Off [ 158s] [ 146.570111] reboot: Power down [ 159s] ### VM INTERACTION END ### [ 159s] [ 159s] lamb18 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:14:03 UTC 2018. [ 159s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:16:45 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:16:45 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b92dcc8c7a16_1c0c4d06842481fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 183s] No package 'libpcsclite' found [ 183s] simtrace2-remsim.o: In function `main': [ 183s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 183s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 183s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 183s] apdu_dispatch.o: In function `apdu_segment_in': [ 183s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 183s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 183s] collect2: error: ld returned 1 exit status [ 183s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 183s] make[2]: *** [simtrace2-remsim] Error 1 [ 183s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 183s] Makefile:20: recipe for target 'utils' failed [ 183s] make[1]: *** [utils] Error 2 [ 183s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 183s] dh_auto_build: make -j1 returned exit code 2 [ 183s] debian/rules:4: recipe for target 'build' failed [ 183s] make: *** [build] Error 2 [ 183s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 183s] [ 183s] wildcard2 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:16:33 UTC 2018. [ 183s] [ 183s] ### VM INTERACTION START ### [ 187s] [ 157.975833] sysrq: SysRq : Power Off [ 187s] [ 157.978794] reboot: Power down [ 189s] ### VM INTERACTION END ### [ 189s] [ 189s] wildcard2 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:16:39 UTC 2018. [ 189s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:19:36 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:19:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b92dd662d4d4_1c0c4d06842491d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 146s] No package 'libpcsclite' found [ 146s] simtrace2-remsim.o: In function `main': [ 146s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 146s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 146s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 146s] apdu_dispatch.o: In function `apdu_segment_in': [ 146s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 146s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 146s] collect2: error: ld returned 1 exit status [ 146s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 146s] make[2]: *** [simtrace2-remsim] Error 1 [ 146s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 146s] Makefile:20: recipe for target 'utils' failed [ 146s] make[1]: *** [utils] Error 2 [ 146s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 146s] dh_auto_build: make -j1 returned exit code 2 [ 146s] debian/rules:4: recipe for target 'build' failed [ 146s] make: *** [build] Error 2 [ 146s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 146s] [ 146s] lamb21 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:19:23 UTC 2018. [ 146s] [ 146s] ### VM INTERACTION START ### [ 149s] [ 138.026670] sysrq: SysRq : Power Off [ 149s] [ 138.031861] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] lamb21 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:19:27 UTC 2018. [ 149s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:20:28 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:20:28 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b92dd99deb15_1c0c4d0684249289@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 206s] No package 'libpcsclite' found [ 206s] simtrace2-remsim.o: In function `main': [ 206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 206s] apdu_dispatch.o: In function `apdu_segment_in': [ 206s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 206s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 206s] collect2: error: ld returned 1 exit status [ 206s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 206s] make[2]: *** [simtrace2-remsim] Error 1 [ 206s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 206s] Makefile:20: recipe for target 'utils' failed [ 206s] make[1]: *** [utils] Error 2 [ 206s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 206s] dh_auto_build: make -j1 returned exit code 2 [ 206s] debian/rules:4: recipe for target 'build' failed [ 206s] make: *** [build] Error 2 [ 206s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 206s] [ 206s] lamb26 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:20:18 UTC 2018. [ 206s] [ 206s] ### VM INTERACTION START ### [ 209s] [ 195.319065] sysrq: SysRq : Power Off [ 209s] [ 195.324547] reboot: Power down [ 210s] ### VM INTERACTION END ### [ 210s] [ 210s] lamb26 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:20:23 UTC 2018. [ 210s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:21:36 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:21:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b92ddd95cb38_1c0c4d0684249487@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 194s] No package 'libpcsclite' found [ 194s] simtrace2-remsim.o: In function `main': [ 194s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 194s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 194s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 194s] apdu_dispatch.o: In function `apdu_segment_in': [ 194s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 194s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 194s] collect2: error: ld returned 1 exit status [ 194s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 194s] make[2]: *** [simtrace2-remsim] Error 1 [ 195s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 195s] Makefile:20: recipe for target 'utils' failed [ 195s] make[1]: *** [utils] Error 2 [ 195s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 195s] dh_auto_build: make -j1 returned exit code 2 [ 195s] debian/rules:4: recipe for target 'build' failed [ 195s] make: *** [build] Error 2 [ 195s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 195s] [ 195s] cloud119 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:21:18 UTC 2018. [ 195s] [ 195s] ### VM INTERACTION START ### [ 198s] [ 172.633733] sysrq: SysRq : Power Off [ 198s] [ 172.656443] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] cloud119 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:21:24 UTC 2018. [ 199s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:21:36 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:21:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b92ddd99aff6_1c0c4d068424957b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 269s] No package 'libpcsclite' found [ 269s] simtrace2-remsim.o: In function `main': [ 269s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 269s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 269s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 269s] apdu_dispatch.o: In function `apdu_segment_in': [ 269s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 269s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 269s] collect2: error: ld returned 1 exit status [ 269s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 269s] make[2]: *** [simtrace2-remsim] Error 1 [ 269s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 269s] Makefile:20: recipe for target 'utils' failed [ 269s] make[1]: *** [utils] Error 2 [ 269s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 269s] dh_auto_build: make -j1 returned exit code 2 [ 269s] debian/rules:4: recipe for target 'build' failed [ 269s] make: *** [build] Error 2 [ 269s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 269s] [ 269s] lamb23 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:21:20 UTC 2018. [ 269s] [ 269s] ### VM INTERACTION START ### [ 273s] [ 260.905266] sysrq: SysRq : Power Off [ 273s] [ 260.987822] reboot: Power down [ 273s] ### VM INTERACTION END ### [ 273s] [ 273s] lamb23 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:21:25 UTC 2018. [ 273s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 7 20:51:02 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 07 Sep 2018 20:51:02 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b92e4c2220fe_1c0c4d0684267193@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 338s] No package 'libpcsclite' found [ 338s] simtrace2-remsim.o: In function `main': [ 338s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 338s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 338s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 338s] apdu_dispatch.o: In function `apdu_segment_in': [ 338s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 338s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 338s] collect2: error: ld returned 1 exit status [ 338s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 338s] make[2]: *** [simtrace2-remsim] Error 1 [ 338s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 338s] Makefile:20: recipe for target 'utils' failed [ 338s] make[1]: *** [utils] Error 2 [ 338s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 338s] dh_auto_build: make -j1 returned exit code 2 [ 338s] debian/rules:4: recipe for target 'build' failed [ 338s] make: *** [build] Error 2 [ 338s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 338s] [ 338s] armbuild17 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:50:57 UTC 2018. [ 338s] [ 338s] ### VM INTERACTION START ### [ 342s] [ 303.055150] SysRq : Power Off [ 342s] [ 303.056747] reboot: Power down [ 342s] ### VM INTERACTION END ### [ 342s] [ 342s] armbuild17 failed "build simtrace2_0.5.1.14.faf1.dsc" at Fri Sep 7 20:51:01 UTC 2018. [ 342s] -- 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 Sep 8 06:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 8 Sep 2018 06:23:33 +0000 Subject: Change in simtrace2[master]: owhw: set the right simtrace USB ID in usb2udp Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10844 Change subject: owhw: set the right simtrace USB ID in usb2udp ...................................................................... owhw: set the right simtrace USB ID in usb2udp Change-Id: I0b54c2eb98b3fad1e2afaf9b81fbe4518b01fbda --- M host/usb2udp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/44/10844/1 diff --git a/host/usb2udp.c b/host/usb2udp.c index c25920f..97ffad0 100644 --- a/host/usb2udp.c +++ b/host/usb2udp.c @@ -35,7 +35,7 @@ #include -#include "simtrace.h" +#include "simtrace_usb.h" #include "simtrace_prot.h" #include "apdu_dispatch.h" #include "simtrace2-discovery.h" @@ -243,7 +243,7 @@ libusb_set_pollfd_notifiers(NULL, &libusb_fd_added_cb, &libusb_fd_removed_cb, NULL); - g_devh = libusb_open_device_with_vid_pid(NULL, SIMTRACE_USB_VENDOR, SIMTRACE_USB_PRODUCT); + g_devh = libusb_open_device_with_vid_pid(NULL, USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3); if (!g_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; -- To view, visit https://gerrit.osmocom.org/10844 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: I0b54c2eb98b3fad1e2afaf9b81fbe4518b01fbda Gerrit-Change-Number: 10844 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Sep 8 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 8 Sep 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_#240?= In-Reply-To: <158065946.171.1536333006589.JavaMail.jenkins@jenkins.osmocom.org> References: <158065946.171.1536333006589.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2063177658.6.1536419406562.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_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 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_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 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 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_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 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 admin at opensuse.org Sat Sep 8 19:56:22 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:56:22 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9429775dea_1c0c4d068444819f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 91s] No package 'libpcsclite' found [ 91s] simtrace2-remsim.o: In function `main': [ 91s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 91s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 91s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 91s] apdu_dispatch.o: In function `apdu_segment_in': [ 91s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 91s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 91s] collect2: error: ld returned 1 exit status [ 91s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 91s] make[2]: *** [simtrace2-remsim] Error 1 [ 91s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 91s] Makefile:20: recipe for target 'utils' failed [ 91s] make[1]: *** [utils] Error 2 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 91s] dh_auto_build: make -j1 returned exit code 2 [ 91s] debian/rules:4: recipe for target 'build' failed [ 91s] make: *** [build] Error 2 [ 91s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 91s] [ 91s] build85 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:08 UTC 2018. [ 91s] [ 91s] ### VM INTERACTION START ### [ 94s] [ 86.420490] sysrq: SysRq : Power Off [ 94s] [ 86.422129] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] build85 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:12 UTC 2018. [ 94s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:56:39 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:56:39 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9429961c760_1c0c4d06844482a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb09 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:31 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 128.970490] sysrq: SysRq : Power Off [ 139s] [ 128.975588] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb09 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:35 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:56:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:56:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b942996c5f6f_1c0c4d0684448398@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 133s] No package 'libpcsclite' found [ 133s] simtrace2-remsim.o: In function `main': [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 133s] apdu_dispatch.o: In function `apdu_segment_in': [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 133s] collect2: error: ld returned 1 exit status [ 133s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 133s] make[2]: *** [simtrace2-remsim] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 133s] Makefile:20: recipe for target 'utils' failed [ 133s] make[1]: *** [utils] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] dh_auto_build: make -j1 returned exit code 2 [ 133s] debian/rules:4: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] lamb16 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:46 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 124.537608] sysrq: SysRq : Power Off [ 136s] [ 124.544194] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] lamb16 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:49 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:56:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:56:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9429978103e_1c0c4d068444854@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 153s] No package 'libpcsclite' found [ 153s] simtrace2-remsim.o: In function `main': [ 153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 153s] apdu_dispatch.o: In function `apdu_segment_in': [ 153s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 153s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 153s] collect2: error: ld returned 1 exit status [ 153s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 153s] make[2]: *** [simtrace2-remsim] Error 1 [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 153s] Makefile:20: recipe for target 'utils' failed [ 153s] make[1]: *** [utils] Error 2 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 153s] dh_auto_build: make -j1 returned exit code 2 [ 153s] debian/rules:4: recipe for target 'build' failed [ 153s] make: *** [build] Error 2 [ 153s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 153s] [ 153s] build36 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:45 UTC 2018. [ 153s] [ 153s] ### VM INTERACTION START ### [ 156s] [ 144.250971] sysrq: SysRq : Power Off [ 156s] [ 144.277868] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] build36 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:50 UTC 2018. [ 157s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:56:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:56:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b942997e8b49_1c0c4d0684448619@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 140s] No package 'libpcsclite' found [ 140s] simtrace2-remsim.o: In function `main': [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 140s] apdu_dispatch.o: In function `apdu_segment_in': [ 140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 140s] collect2: error: ld returned 1 exit status [ 140s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 140s] make[2]: *** [simtrace2-remsim] Error 1 [ 140s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 140s] Makefile:20: recipe for target 'utils' failed [ 140s] make[1]: *** [utils] Error 2 [ 140s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 140s] dh_auto_build: make -j1 returned exit code 2 [ 140s] debian/rules:4: recipe for target 'build' failed [ 140s] make: *** [build] Error 2 [ 140s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 140s] [ 140s] lamb56 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:48 UTC 2018. [ 140s] [ 140s] ### VM INTERACTION START ### [ 143s] [ 132.407099] sysrq: SysRq : Power Off [ 143s] [ 132.413243] reboot: Power down [ 143s] ### VM INTERACTION END ### [ 143s] [ 143s] lamb56 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:52 UTC 2018. [ 143s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:57:13 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:57:13 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9429b29ab4d_1c0c4d068444898e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] No package 'libpcsclite' found [ 160s] simtrace2-remsim.o: In function `main': [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 160s] apdu_dispatch.o: In function `apdu_segment_in': [ 160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 160s] collect2: error: ld returned 1 exit status [ 160s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 160s] make[2]: *** [simtrace2-remsim] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 160s] Makefile:20: recipe for target 'utils' failed [ 160s] make[1]: *** [utils] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: make -j1 returned exit code 2 [ 160s] debian/rules:4: recipe for target 'build' failed [ 160s] make: *** [build] Error 2 [ 160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 160s] [ 160s] lamb20 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:57:02 UTC 2018. [ 160s] [ 160s] ### VM INTERACTION START ### [ 163s] [ 152.123969] sysrq: SysRq : Power Off [ 163s] [ 152.131757] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] lamb20 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:57:06 UTC 2018. [ 163s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:57:13 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:57:13 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9429b31d35d_1c0c4d068444902b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb14 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:54 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 129.622786] sysrq: SysRq : Power Off [ 139s] [ 129.630177] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb14 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:56:57 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 19:58:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 19:58:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b942a0cca498_1c0c4d06844494ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 220s] No package 'libpcsclite' found [ 220s] simtrace2-remsim.o: In function `main': [ 220s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 220s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 220s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 220s] apdu_dispatch.o: In function `apdu_segment_in': [ 220s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 220s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 220s] collect2: error: ld returned 1 exit status [ 220s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 220s] make[2]: *** [simtrace2-remsim] Error 1 [ 220s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 220s] Makefile:20: recipe for target 'utils' failed [ 220s] make[1]: *** [utils] Error 2 [ 220s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 220s] dh_auto_build: make -j1 returned exit code 2 [ 220s] debian/rules:4: recipe for target 'build' failed [ 220s] make: *** [build] Error 2 [ 220s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 220s] [ 220s] cloud108 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:58:48 UTC 2018. [ 220s] [ 220s] ### VM INTERACTION START ### [ 224s] [ 193.007912] sysrq: SysRq : Power Off [ 224s] [ 193.012446] reboot: Power down [ 225s] ### VM INTERACTION END ### [ 225s] [ 225s] cloud108 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 19:58:54 UTC 2018. [ 225s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 8 20:36:27 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 08 Sep 2018 20:36:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9432d4f0351_1c0c4d0684452168@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 345s] No package 'libpcsclite' found [ 345s] simtrace2-remsim.o: In function `main': [ 345s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 345s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 345s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 345s] apdu_dispatch.o: In function `apdu_segment_in': [ 345s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 345s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 345s] collect2: error: ld returned 1 exit status [ 345s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 345s] make[2]: *** [simtrace2-remsim] Error 1 [ 345s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 345s] Makefile:20: recipe for target 'utils' failed [ 345s] make[1]: *** [utils] Error 2 [ 345s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 345s] dh_auto_build: make -j1 returned exit code 2 [ 345s] debian/rules:4: recipe for target 'build' failed [ 345s] make: *** [build] Error 2 [ 345s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 345s] [ 345s] armbuild04 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 20:36:15 UTC 2018. [ 345s] [ 345s] ### VM INTERACTION START ### [ 348s] [ 295.501624] SysRq : Power Off [ 348s] [ 295.512106] reboot: Power down [ 349s] ### VM INTERACTION END ### [ 349s] [ 349s] armbuild04 failed "build simtrace2_0.5.1.14.faf1.dsc" at Sat Sep 8 20:36:18 UTC 2018. [ 349s] -- 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 Sep 9 02:15:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 9 Sep 2018 02:15:12 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane wayfor non-trivially copyable types In-Reply-To: References: Message-ID: Vadim Yanitskiy 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 2: (3 comments) https://gerrit.osmocom.org/#/c/10721/2/CommonLibs/Vector.h File CommonLibs/Vector.h: https://gerrit.osmocom.org/#/c/10721/2/CommonLibs/Vector.h at 212 PS2, Line 212: for( A space is missing. https://gerrit.osmocom.org/#/c/10721/2/Transceiver52M/signalVector.cpp File Transceiver52M/signalVector.cpp: https://gerrit.osmocom.org/#/c/10721/2/Transceiver52M/signalVector.cpp at 48 PS2, Line 48: for( same https://gerrit.osmocom.org/#/c/10721/2/Transceiver52M/signalVector.cpp at 71 PS2, Line 71: for( same -- 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: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 09 Sep 2018 02:15:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 10:50:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 10:50:01 +0000 Subject: Change in simtrace2[master]: owhw: set the right simtrace USB ID in usb2udp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10844 ) Change subject: owhw: set the right simtrace USB ID in usb2udp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10844 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: I0b54c2eb98b3fad1e2afaf9b81fbe4518b01fbda Gerrit-Change-Number: 10844 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 10:50:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 11:54:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 11:54:04 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10843 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10843 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: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 Gerrit-Change-Number: 10843 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: Sun, 09 Sep 2018 11:54: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 Sep 9 11:55:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 11:55:25 +0000 Subject: Change in simtrace2[master]: owhw: set the right simtrace USB ID in usb2udp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10844 ) Change subject: owhw: set the right simtrace USB ID in usb2udp ...................................................................... owhw: set the right simtrace USB ID in usb2udp Change-Id: I0b54c2eb98b3fad1e2afaf9b81fbe4518b01fbda --- M host/usb2udp.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/usb2udp.c b/host/usb2udp.c index c25920f..97ffad0 100644 --- a/host/usb2udp.c +++ b/host/usb2udp.c @@ -35,7 +35,7 @@ #include -#include "simtrace.h" +#include "simtrace_usb.h" #include "simtrace_prot.h" #include "apdu_dispatch.h" #include "simtrace2-discovery.h" @@ -243,7 +243,7 @@ libusb_set_pollfd_notifiers(NULL, &libusb_fd_added_cb, &libusb_fd_removed_cb, NULL); - g_devh = libusb_open_device_with_vid_pid(NULL, SIMTRACE_USB_VENDOR, SIMTRACE_USB_PRODUCT); + g_devh = libusb_open_device_with_vid_pid(NULL, USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3); if (!g_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; -- To view, visit https://gerrit.osmocom.org/10844 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: I0b54c2eb98b3fad1e2afaf9b81fbe4518b01fbda Gerrit-Change-Number: 10844 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 Sun Sep 9 13:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 13:46:51 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix rejecting SMS-CB related RSL messages Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10845 Change subject: CBCH: Fix rejecting SMS-CB related RSL messages ...................................................................... CBCH: Fix rejecting SMS-CB related RSL messages Normally, the "Common Channel" related RSL messages should actually contain such a common channel. However, since cell broadcast is implemented inside what's essentially a downlink SDCCH, we should add some explicit exceptions. Before this patch, any RSL SMS BC CMD would have been discarded and an RSL Error Indiciation returned. Change-Id: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 --- M src/common/rsl.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/10845/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index ff2d997..c6c00ea 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2725,8 +2725,12 @@ } msg->l3h = (unsigned char *)cch + sizeof(*cch); - if (chan_nr_is_dchan(cch->chan_nr)) - return rsl_reject_unknown_lchan(msg); + /* normally we don't permit dedicated channels here ... */ + if (chan_nr_is_dchan(cch->chan_nr)) { + /* ... however, CBCH is on a SDCCH, so we must permit it */ + if (cch->c.msg_type != RSL_MT_SMS_BC_CMD && cch->c.msg_type != RSL_MT_SMS_BC_REQ) + return rsl_reject_unknown_lchan(msg); + } msg->lchan = lchan_lookup(trx, cch->chan_nr, "RSL rx CCHAN: "); if (!msg->lchan) { -- To view, visit https://gerrit.osmocom.org/10845 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: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Gerrit-Change-Number: 10845 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 13:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 13:46:52 +0000 Subject: Change in osmo-bts[master]: CBCH: Use llist_first_entry_or_null() instead of reinventing it Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10846 Change subject: CBCH: Use llist_first_entry_or_null() instead of reinventing it ...................................................................... CBCH: Use llist_first_entry_or_null() instead of reinventing it Change-Id: I376111e71d1c7be35a8fd7e392488adc34e21941 --- M src/common/cbch.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/10846/1 diff --git a/src/common/cbch.c b/src/common/cbch.c index b8f69c6..56d76f1 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -144,12 +144,10 @@ { struct smscb_msg *msg; - if (llist_empty(&bts->smscb_state.queue)) + msg = llist_first_entry_or_null(&bts->smscb_state.queue, struct smscb_msg, list); + if (!msg) return NULL; - msg = llist_entry(bts->smscb_state.queue.next, - struct smscb_msg, list); - llist_del(&msg->list); return msg; -- To view, visit https://gerrit.osmocom.org/10846 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: I376111e71d1c7be35a8fd7e392488adc34e21941 Gerrit-Change-Number: 10846 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 13:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 13:46:52 +0000 Subject: Change in osmo-bts[master]: CBCH: Add FIXME comments on queue overflow/underflow handling Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10847 Change subject: CBCH: Add FIXME comments on queue overflow/underflow handling ...................................................................... CBCH: Add FIXME comments on queue overflow/underflow handling Change-Id: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 --- M src/common/cbch.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/10847/1 diff --git a/src/common/cbch.c b/src/common/cbch.c index 56d76f1..7bbe2c9 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -136,6 +136,7 @@ } llist_add_tail(&scm->list, &bts->smscb_state.queue); + /* FIXME: limit queue size and optionally send CBCH LOAD Information (overflow) via RSL */ return 0; } @@ -145,8 +146,10 @@ struct smscb_msg *msg; msg = llist_first_entry_or_null(&bts->smscb_state.queue, struct smscb_msg, list); - if (!msg) + if (!msg) { + /* FIXME: send CBCH LOAD Information (underflow) via RSL */ return NULL; + } llist_del(&msg->list); -- To view, visit https://gerrit.osmocom.org/10847 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: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 Gerrit-Change-Number: 10847 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 13:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 13:46:53 +0000 Subject: Change in osmo-bts[master]: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10848 Change subject: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure ...................................................................... CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e --- M src/common/cbch.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/10848/1 diff --git a/src/common/cbch.c b/src/common/cbch.c index 7bbe2c9..c628cb5 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -20,6 +20,7 @@ #include +#include #include #include @@ -59,6 +60,7 @@ /* No message: Send NULL mesage */ return get_smscb_null_block(out); } + OSMO_ASSERT(msg->next_seg < 4); block_type = (struct gsm412_block_type *) out++; @@ -70,6 +72,7 @@ to_copy = GSM412_MSG_LEN - (msg->next_seg * GSM412_BLOCK_LEN); if (to_copy > GSM412_BLOCK_LEN) to_copy = GSM412_BLOCK_LEN; + OSMO_ASSERT(to_copy >= 0); /* copy data and increment index */ memcpy(out, &msg->msg[msg->next_seg * GSM412_BLOCK_LEN], to_copy); @@ -115,6 +118,8 @@ } scm = talloc_zero_size(bts, sizeof(*scm)); + if (!scm) + return -1; /* initialize entire message with default padding */ memset(scm->msg, GSM_MACBLOCK_PADDING, sizeof(scm->msg)); -- To view, visit https://gerrit.osmocom.org/10848 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: I85fdecbf20de83a6f925765a46b5cd14765da03e Gerrit-Change-Number: 10848 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 13:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 13:46:53 +0000 Subject: Change in osmo-bts[master]: [sysmo, lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10849 Change subject: [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() ...................................................................... [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() Whenever a CBCH is used, this results in a new physical channel combination on the relevant timeslot. The chan_nr_by_sapi() function must handle those cbch-enabled PCHAN types. Change-Id: I963909bcec8392ec445d0bcf53a2a8d7d9535444 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-sysmo/l1_if.c 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/10849/1 diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 8bb4909..c873fb1 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -711,9 +711,11 @@ cbits = 0x02 + subCh; break; case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: @@ -725,9 +727,11 @@ case GsmL1_Sapi_Sdcch: switch(pchan) { case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 5d52146..7f09fb1 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -708,9 +708,11 @@ cbits = 0x02 + subCh; break; case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: @@ -722,9 +724,11 @@ case GsmL1_Sapi_Sdcch: switch(pchan) { case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: -- To view, visit https://gerrit.osmocom.org/10849 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: I963909bcec8392ec445d0bcf53a2a8d7d9535444 Gerrit-Change-Number: 10849 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 14:27:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 14:27:31 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix rejecting SMS-CB related RSL messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10845 ) Change subject: CBCH: Fix rejecting SMS-CB related RSL messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10845 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: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Gerrit-Change-Number: 10845 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 14:27:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 14:28:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 14:28:46 +0000 Subject: Change in osmo-bts[master]: CBCH: Implement CBCH support for osmo-bts-{trx, virtual} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10603 ) Change subject: CBCH: Implement CBCH support for osmo-bts-{trx,virtual} ...................................................................... Set Ready For Review -- 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: comment Gerrit-Change-Id: Icc15603079a1709ec094f400a9bcf0008211890f Gerrit-Change-Number: 10603 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 09 Sep 2018 14:28:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 14:29:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 14:29:22 +0000 Subject: Change in osmo-bts[master]: CBCH: Implement CBCH support for osmo-bts-{trx, virtual} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10603 ) Change subject: CBCH: Implement CBCH support for osmo-bts-{trx,virtual} ...................................................................... Patch Set 4: Code-Review+2 -- 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: comment Gerrit-Change-Id: Icc15603079a1709ec094f400a9bcf0008211890f Gerrit-Change-Number: 10603 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 09 Sep 2018 14: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 Sun Sep 9 14:29:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 14:29:34 +0000 Subject: Change in osmo-bts[master]: CBCH: Use llist_first_entry_or_null() instead of reinventing it In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10846 ) Change subject: CBCH: Use llist_first_entry_or_null() instead of reinventing it ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10846 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: I376111e71d1c7be35a8fd7e392488adc34e21941 Gerrit-Change-Number: 10846 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 14:29: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 Sep 9 14:29:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 14:29:53 +0000 Subject: Change in osmo-bts[master]: [sysmo, lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10849 ) Change subject: [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10849 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: I963909bcec8392ec445d0bcf53a2a8d7d9535444 Gerrit-Change-Number: 10849 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 14:29:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:05:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:05:48 +0000 Subject: Change in osmo-bsc[master]: cbch: Don't send cell-broadcast command on BTS without CBCH channel Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10850 Change subject: cbch: Don't send cell-broadcast command on BTS without CBCH channel ...................................................................... cbch: Don't send cell-broadcast command on BTS without CBCH channel Change-Id: I83d6b0b3eafd83e2c0fbdec81d9677ff0118db92 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/10850/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index e99029a..b1938e6 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4240,6 +4240,10 @@ vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; } + if (!gsm_bts_get_cbch(bts)) { + vty_out(vty, "%% BTS %d doesn't have a CBCH%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + } rc = osmo_hexparse(argv[2], buf, sizeof(buf)); if (rc < 0 || rc > sizeof(buf)) { vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/10850 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: I83d6b0b3eafd83e2c0fbdec81d9677ff0118db92 Gerrit-Change-Number: 10850 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:05:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:05:48 +0000 Subject: Change in osmo-bsc[master]: CBCH: Fix gsm_bts_get_cbch() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10851 Change subject: CBCH: Fix gsm_bts_get_cbch() ...................................................................... CBCH: Fix gsm_bts_get_cbch() When the timeslot FSMs were introduced, the function gsm_bts_get_cbch() was ported to use 'pchan_is'. However, the function is called very early, before pchan_is is actually initialized. Let's make sure we're using the _configured_ channel combination when resolving where the CBCH is (if any) in the BTS. Ever since merging the timeslot FSMs and before this patch, SI4 would never indicate the presence of a CBCH. Change-Id: I6251b5f3e1180ad466e9349a1845e1b91f661c0b Related: OS#3532 --- M src/osmo-bsc/gsm_data.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/10851/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index ac965e2..a953ce1 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1204,12 +1204,12 @@ struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; - if (trx->ts[0].pchan_is == GSM_PCHAN_CCCH_SDCCH4_CBCH) + if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) lchan = &trx->ts[0].lchan[2]; else { int i; for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { + if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { lchan = &trx->ts[i].lchan[2]; break; } -- To view, visit https://gerrit.osmocom.org/10851 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: I6251b5f3e1180ad466e9349a1845e1b91f661c0b Gerrit-Change-Number: 10851 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 9 15:13:19 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 15:13:19 +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_#241?= In-Reply-To: <2063177658.6.1536419406562.JavaMail.jenkins@jenkins.osmocom.org> References: <2063177658.6.1536419406562.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1426935843.14.1536505999654.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:24:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:24:26 +0000 Subject: Change in osmo-bsc[master]: gsm48_lchan2chan_desc() belongs to gsm_data.h Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10852 Change subject: gsm48_lchan2chan_desc() belongs to gsm_data.h ...................................................................... gsm48_lchan2chan_desc() belongs to gsm_data.h The function is defined in gsm_data.c, so it should be declared in gsm_data.h and not in gsm_04_08_rr.h Change-Id: I5200063fb43c857a984ea8e41a8485d796e49cde --- M include/osmocom/bsc/gsm_04_08_rr.h M include/osmocom/bsc/gsm_data.h 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/10852/1 diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 8f46922..7b7a62f 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -22,8 +22,6 @@ int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, struct msgb *msg, struct bsc_subscr *bsub); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); -void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, - const struct gsm_lchan *lchan); int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index d6e8954..68f888f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1198,6 +1198,9 @@ uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config as_pchan); +void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, + const struct gsm_lchan *lchan); + /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); -- To view, visit https://gerrit.osmocom.org/10852 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: I5200063fb43c857a984ea8e41a8485d796e49cde Gerrit-Change-Number: 10852 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:24:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:24:26 +0000 Subject: Change in osmo-bsc[master]: Introduce gsm48_lchan2chan_desc_as_configured() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10853 Change subject: Introduce gsm48_lchan2chan_desc_as_configured() ...................................................................... Introduce gsm48_lchan2chan_desc_as_configured() gsm48_lchan2chan_desc_as_configured() is similar to gsm48_lchan2chan_desc(), but uses the *configured* channel combination, rather than the currently active one. Change-Id: Id4043218fb770e8420f19a4ef9428680ecdfd286 Related: OS#3532 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_data.c 2 files changed, 20 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/10853/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 68f888f..e408ff9 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1200,6 +1200,7 @@ void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); +void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index ac965e2..12ab66e 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1329,13 +1329,10 @@ gsm_trx_all_ts_dispatch(trx, ts_ev, data); } -void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, - const struct gsm_lchan *lchan) +static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { - uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; - - cd->chan_nr = gsm_lchan2chan_nr(lchan); if (!lchan->ts->hopping.enabled) { + uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; cd->h0.tsc = gsm_ts_tsc(lchan->ts); cd->h0.h = 0; cd->h0.arfcn_high = arfcn >> 8; @@ -1349,6 +1346,23 @@ } } +void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, + const struct gsm_lchan *lchan) +{ + cd->chan_nr = gsm_lchan2chan_nr(lchan); + _chan_desc_fill_tail(cd, lchan); +} + +/* like gsm48_lchan2chan_desc() above, but use ts->pchan_from_config to + * return a channel description based on what is configured, rather than + * what the current state of the pchan type is */ +void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, + const struct gsm_lchan *lchan) +{ + cd->chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr); + _chan_desc_fill_tail(cd, lchan); +} + bool nm_is_running(const struct gsm_nm_state *s) { return (s->operational == NM_OPSTATE_ENABLED) && ( (s->availability == NM_AVSTATE_OK) || -- To view, visit https://gerrit.osmocom.org/10853 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: Id4043218fb770e8420f19a4ef9428680ecdfd286 Gerrit-Change-Number: 10853 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:24:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:24:27 +0000 Subject: Change in osmo-bsc[master]: CBCH: Fix SI4 CBCH IE generation Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10854 Change subject: CBCH: Fix SI4 CBCH IE generation ...................................................................... CBCH: Fix SI4 CBCH IE generation When a CBCH is present in the cell, SI4 contains the channel description of the CBCH. As SI4 may be generated at a time when the underlying timeslot is not configured yet, we need to generate the channel description for the _configured_ channel combination, not the currently used one. Change-Id: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609 Closes: OS#3532 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/10854/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 232a1b6..2104e92 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -963,7 +963,7 @@ cbch_lchan = gsm_bts_get_cbch(bts); if (cbch_lchan) { struct gsm48_chan_desc cd; - gsm48_lchan2chan_desc(&cd, cbch_lchan); + gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan); tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3, (uint8_t *) &cd); l2_plen += 3 + 1; -- To view, visit https://gerrit.osmocom.org/10854 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: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609 Gerrit-Change-Number: 10854 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:25:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:25:21 +0000 Subject: Change in osmo-bsc[master]: cbch: Don't send cell-broadcast command on BTS without CBCH channel In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10850 ) Change subject: cbch: Don't send cell-broadcast command on BTS without CBCH channel ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10850 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: I83d6b0b3eafd83e2c0fbdec81d9677ff0118db92 Gerrit-Change-Number: 10850 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 15:25:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:25:29 +0000 Subject: Change in osmo-bsc[master]: gsm48_lchan2chan_desc() belongs to gsm_data.h In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10852 ) Change subject: gsm48_lchan2chan_desc() belongs to gsm_data.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10852 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: I5200063fb43c857a984ea8e41a8485d796e49cde Gerrit-Change-Number: 10852 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 15:25:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:25:38 +0000 Subject: Change in osmo-bsc[master]: Introduce gsm48_lchan2chan_desc_as_configured() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10853 ) Change subject: Introduce gsm48_lchan2chan_desc_as_configured() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10853 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: Id4043218fb770e8420f19a4ef9428680ecdfd286 Gerrit-Change-Number: 10853 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 15: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 Sun Sep 9 15:25:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:25:48 +0000 Subject: Change in osmo-bsc[master]: CBCH: Fix SI4 CBCH IE generation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10854 ) Change subject: CBCH: Fix SI4 CBCH IE generation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10854 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: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609 Gerrit-Change-Number: 10854 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 15:25: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 Sep 9 15:26:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:26:07 +0000 Subject: Change in osmo-bsc[master]: CBCH: Fix gsm_bts_get_cbch() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10851 ) Change subject: CBCH: Fix gsm_bts_get_cbch() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10851 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: I6251b5f3e1180ad466e9349a1845e1b91f661c0b Gerrit-Change-Number: 10851 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 15:26: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 Sep 9 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:36:53 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix rejecting SMS-CB related RSL messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10845 to look at the new patch set (#2). Change subject: CBCH: Fix rejecting SMS-CB related RSL messages ...................................................................... CBCH: Fix rejecting SMS-CB related RSL messages Normally, the "Common Channel" related RSL messages should actually contain such a common channel. However, since cell broadcast is implemented inside what's essentially a downlink SDCCH, we should add some explicit exceptions. Before this patch, any RSL SMS BC CMD would have been discarded and an RSL Error Indiciation returned. Change-Id: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Closes: OS#3533 --- M src/common/rsl.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/10845/2 -- To view, visit https://gerrit.osmocom.org/10845 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: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Gerrit-Change-Number: 10845 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 Sep 9 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:36:53 +0000 Subject: Change in osmo-bts[master]: [sysmo, lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10849 to look at the new patch set (#3). Change subject: [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() ...................................................................... [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() Whenever a CBCH is used, this results in a new physical channel combination on the relevant timeslot. The chan_nr_by_sapi() function must handle those cbch-enabled PCHAN types. Change-Id: I963909bcec8392ec445d0bcf53a2a8d7d9535444 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-sysmo/l1_if.c 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/10849/3 -- To view, visit https://gerrit.osmocom.org/10849 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: I963909bcec8392ec445d0bcf53a2a8d7d9535444 Gerrit-Change-Number: 10849 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 Sep 9 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:36:53 +0000 Subject: Change in osmo-bts[master]: CBCH: Implement CBCH support for osmo-bts-{trx, virtual} 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/10603 to look at the new patch set (#5). 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, 223 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/10603/5 -- 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: newpatchset Gerrit-Change-Id: Icc15603079a1709ec094f400a9bcf0008211890f Gerrit-Change-Number: 10603 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte 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 Sun Sep 9 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:36:53 +0000 Subject: Change in osmo-bts[master]: CBCH: Use llist_first_entry_or_null() instead of reinventing it In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10846 to look at the new patch set (#3). Change subject: CBCH: Use llist_first_entry_or_null() instead of reinventing it ...................................................................... CBCH: Use llist_first_entry_or_null() instead of reinventing it Change-Id: I376111e71d1c7be35a8fd7e392488adc34e21941 --- M src/common/cbch.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/10846/3 -- To view, visit https://gerrit.osmocom.org/10846 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: I376111e71d1c7be35a8fd7e392488adc34e21941 Gerrit-Change-Number: 10846 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 Sep 9 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:36:53 +0000 Subject: Change in osmo-bts[master]: CBCH: Add FIXME comments on queue overflow/underflow handling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10847 to look at the new patch set (#3). Change subject: CBCH: Add FIXME comments on queue overflow/underflow handling ...................................................................... CBCH: Add FIXME comments on queue overflow/underflow handling Change-Id: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 --- M src/common/cbch.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/10847/3 -- To view, visit https://gerrit.osmocom.org/10847 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: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 Gerrit-Change-Number: 10847 Gerrit-PatchSet: 3 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 Sep 9 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:36:53 +0000 Subject: Change in osmo-bts[master]: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10848 to look at the new patch set (#3). Change subject: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure ...................................................................... CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e --- M src/common/cbch.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/10848/3 -- To view, visit https://gerrit.osmocom.org/10848 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: I85fdecbf20de83a6f925765a46b5cd14765da03e Gerrit-Change-Number: 10848 Gerrit-PatchSet: 3 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 Sep 9 15:37:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:37:44 +0000 Subject: Change in osmo-bsc[master]: cbch: Don't send cell-broadcast command on BTS without CBCH channel In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10850 ) Change subject: cbch: Don't send cell-broadcast command on BTS without CBCH channel ...................................................................... cbch: Don't send cell-broadcast command on BTS without CBCH channel Change-Id: I83d6b0b3eafd83e2c0fbdec81d9677ff0118db92 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index e99029a..b1938e6 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4240,6 +4240,10 @@ vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; } + if (!gsm_bts_get_cbch(bts)) { + vty_out(vty, "%% BTS %d doesn't have a CBCH%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + } rc = osmo_hexparse(argv[2], buf, sizeof(buf)); if (rc < 0 || rc > sizeof(buf)) { vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/10850 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: I83d6b0b3eafd83e2c0fbdec81d9677ff0118db92 Gerrit-Change-Number: 10850 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 Sep 9 15:37:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:37:45 +0000 Subject: Change in osmo-bsc[master]: gsm48_lchan2chan_desc() belongs to gsm_data.h In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10852 ) Change subject: gsm48_lchan2chan_desc() belongs to gsm_data.h ...................................................................... gsm48_lchan2chan_desc() belongs to gsm_data.h The function is defined in gsm_data.c, so it should be declared in gsm_data.h and not in gsm_04_08_rr.h Change-Id: I5200063fb43c857a984ea8e41a8485d796e49cde --- M include/osmocom/bsc/gsm_04_08_rr.h M include/osmocom/bsc/gsm_data.h 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 8f46922..7b7a62f 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -22,8 +22,6 @@ int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, struct msgb *msg, struct bsc_subscr *bsub); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); -void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, - const struct gsm_lchan *lchan); int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index d6e8954..68f888f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1198,6 +1198,9 @@ uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config as_pchan); +void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, + const struct gsm_lchan *lchan); + /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); -- To view, visit https://gerrit.osmocom.org/10852 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: I5200063fb43c857a984ea8e41a8485d796e49cde Gerrit-Change-Number: 10852 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 Sep 9 15:37:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:37:45 +0000 Subject: Change in osmo-bsc[master]: Introduce gsm48_lchan2chan_desc_as_configured() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10853 ) Change subject: Introduce gsm48_lchan2chan_desc_as_configured() ...................................................................... Introduce gsm48_lchan2chan_desc_as_configured() gsm48_lchan2chan_desc_as_configured() is similar to gsm48_lchan2chan_desc(), but uses the *configured* channel combination, rather than the currently active one. Change-Id: Id4043218fb770e8420f19a4ef9428680ecdfd286 Related: OS#3532 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_data.c 2 files changed, 20 insertions(+), 5 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 68f888f..e408ff9 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1200,6 +1200,7 @@ void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); +void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index ac965e2..12ab66e 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1329,13 +1329,10 @@ gsm_trx_all_ts_dispatch(trx, ts_ev, data); } -void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, - const struct gsm_lchan *lchan) +static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { - uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; - - cd->chan_nr = gsm_lchan2chan_nr(lchan); if (!lchan->ts->hopping.enabled) { + uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; cd->h0.tsc = gsm_ts_tsc(lchan->ts); cd->h0.h = 0; cd->h0.arfcn_high = arfcn >> 8; @@ -1349,6 +1346,23 @@ } } +void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, + const struct gsm_lchan *lchan) +{ + cd->chan_nr = gsm_lchan2chan_nr(lchan); + _chan_desc_fill_tail(cd, lchan); +} + +/* like gsm48_lchan2chan_desc() above, but use ts->pchan_from_config to + * return a channel description based on what is configured, rather than + * what the current state of the pchan type is */ +void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, + const struct gsm_lchan *lchan) +{ + cd->chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr); + _chan_desc_fill_tail(cd, lchan); +} + bool nm_is_running(const struct gsm_nm_state *s) { return (s->operational == NM_OPSTATE_ENABLED) && ( (s->availability == NM_AVSTATE_OK) || -- To view, visit https://gerrit.osmocom.org/10853 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: Id4043218fb770e8420f19a4ef9428680ecdfd286 Gerrit-Change-Number: 10853 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 Sep 9 15:37:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:37:45 +0000 Subject: Change in osmo-bsc[master]: CBCH: Fix SI4 CBCH IE generation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10854 ) Change subject: CBCH: Fix SI4 CBCH IE generation ...................................................................... CBCH: Fix SI4 CBCH IE generation When a CBCH is present in the cell, SI4 contains the channel description of the CBCH. As SI4 may be generated at a time when the underlying timeslot is not configured yet, we need to generate the channel description for the _configured_ channel combination, not the currently used one. Change-Id: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609 Closes: OS#3532 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 232a1b6..2104e92 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -963,7 +963,7 @@ cbch_lchan = gsm_bts_get_cbch(bts); if (cbch_lchan) { struct gsm48_chan_desc cd; - gsm48_lchan2chan_desc(&cd, cbch_lchan); + gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan); tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3, (uint8_t *) &cd); l2_plen += 3 + 1; -- To view, visit https://gerrit.osmocom.org/10854 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: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609 Gerrit-Change-Number: 10854 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 Sep 9 15:37:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:37:46 +0000 Subject: Change in osmo-bsc[master]: CBCH: Fix gsm_bts_get_cbch() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10851 ) Change subject: CBCH: Fix gsm_bts_get_cbch() ...................................................................... CBCH: Fix gsm_bts_get_cbch() When the timeslot FSMs were introduced, the function gsm_bts_get_cbch() was ported to use 'pchan_is'. However, the function is called very early, before pchan_is is actually initialized. Let's make sure we're using the _configured_ channel combination when resolving where the CBCH is (if any) in the BTS. Ever since merging the timeslot FSMs and before this patch, SI4 would never indicate the presence of a CBCH. Change-Id: I6251b5f3e1180ad466e9349a1845e1b91f661c0b Related: OS#3532 --- M src/osmo-bsc/gsm_data.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 12ab66e..0718e91 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1204,12 +1204,12 @@ struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; - if (trx->ts[0].pchan_is == GSM_PCHAN_CCCH_SDCCH4_CBCH) + if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) lchan = &trx->ts[0].lchan[2]; else { int i; for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { + if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { lchan = &trx->ts[i].lchan[2]; break; } -- To view, visit https://gerrit.osmocom.org/10851 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: I6251b5f3e1180ad466e9349a1845e1b91f661c0b Gerrit-Change-Number: 10851 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 Sep 9 15:38:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:38:16 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix rejecting SMS-CB related RSL messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10845 ) Change subject: CBCH: Fix rejecting SMS-CB related RSL messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10845 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: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Gerrit-Change-Number: 10845 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Sep 2018 15:38: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 Sep 9 15:40:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:40:39 +0000 Subject: Change in osmo-bts[master]: CBCH: Move processing via L1SAP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10602 ) Change subject: CBCH: Move processing via L1SAP ...................................................................... Set Ready For Review -- 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: comment Gerrit-Change-Id: Ibdba4c5e808330f8406f441a97fe0e81170fce97 Gerrit-Change-Number: 10602 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 09 Sep 2018 15:40:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 15:40:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:40:59 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix rejecting SMS-CB related RSL messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10845 ) Change subject: CBCH: Fix rejecting SMS-CB related RSL messages ...................................................................... CBCH: Fix rejecting SMS-CB related RSL messages Normally, the "Common Channel" related RSL messages should actually contain such a common channel. However, since cell broadcast is implemented inside what's essentially a downlink SDCCH, we should add some explicit exceptions. Before this patch, any RSL SMS BC CMD would have been discarded and an RSL Error Indiciation returned. Change-Id: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Closes: OS#3533 --- M src/common/rsl.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index ff2d997..c6c00ea 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2725,8 +2725,12 @@ } msg->l3h = (unsigned char *)cch + sizeof(*cch); - if (chan_nr_is_dchan(cch->chan_nr)) - return rsl_reject_unknown_lchan(msg); + /* normally we don't permit dedicated channels here ... */ + if (chan_nr_is_dchan(cch->chan_nr)) { + /* ... however, CBCH is on a SDCCH, so we must permit it */ + if (cch->c.msg_type != RSL_MT_SMS_BC_CMD && cch->c.msg_type != RSL_MT_SMS_BC_REQ) + return rsl_reject_unknown_lchan(msg); + } msg->lchan = lchan_lookup(trx, cch->chan_nr, "RSL rx CCHAN: "); if (!msg->lchan) { -- To view, visit https://gerrit.osmocom.org/10845 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: I2f7f1dd43505cc27cd33489d8b0e8c981cd93880 Gerrit-Change-Number: 10845 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 Sep 9 15:40:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:40:59 +0000 Subject: Change in osmo-bts[master]: [sysmo, lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10849 ) Change subject: [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() ...................................................................... [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() Whenever a CBCH is used, this results in a new physical channel combination on the relevant timeslot. The chan_nr_by_sapi() function must handle those cbch-enabled PCHAN types. Change-Id: I963909bcec8392ec445d0bcf53a2a8d7d9535444 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-sysmo/l1_if.c 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index e6cdfd4..f582bf2 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -709,9 +709,11 @@ cbits = 0x02 + subCh; break; case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: @@ -723,9 +725,11 @@ case GsmL1_Sapi_Sdcch: switch(pchan) { case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 3adb442..1321fe6 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -706,9 +706,11 @@ cbits = 0x02 + subCh; break; case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: @@ -720,9 +722,11 @@ case GsmL1_Sapi_Sdcch: switch(pchan) { case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: -- To view, visit https://gerrit.osmocom.org/10849 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: I963909bcec8392ec445d0bcf53a2a8d7d9535444 Gerrit-Change-Number: 10849 Gerrit-PatchSet: 4 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 Sep 9 15:40:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:40:59 +0000 Subject: Change in osmo-bts[master]: CBCH: Move processing via L1SAP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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. This also has the added benefit of logging CBCH via GSMTAP. Change-Id: Ibdba4c5e808330f8406f441a97fe0e81170fce97 Closes: OS#3534 --- 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, 16 insertions(+), 15 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 4568b7e..3225a60 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) == 0xc8) /* 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 55b4a4b..b29fcc7 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) @@ -265,6 +266,8 @@ *chan_type = GSMTAP_CHANNEL_PCH; else *chan_type = GSMTAP_CHANNEL_AGCH; + } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) { + *chan_type = GSMTAP_CHANNEL_CBCH51; } else if (L1SAP_IS_CHAN_PDCH(chan_nr)) { *chan_type = GSMTAP_CHANNEL_PDTCH; } @@ -737,6 +740,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 f582bf2..82299ff 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 = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + break; case GsmL1_Sapi_Sacch: switch(pchan) { case GSM_PCHAN_TCH_F: @@ -867,10 +869,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..35d0aa3 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 = 0xc8; /* 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 1321fe6..c0b42b4 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 = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + break; case GsmL1_Sapi_Sacch: switch(pchan) { case GSM_PCHAN_TCH_F: @@ -864,10 +866,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: merged Gerrit-Change-Id: Ibdba4c5e808330f8406f441a97fe0e81170fce97 Gerrit-Change-Number: 10602 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte 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 Sun Sep 9 15:41:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:41:00 +0000 Subject: Change in osmo-bts[master]: CBCH: Implement CBCH support for osmo-bts-{trx, virtual} In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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, 223 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified 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..8a6c007 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -116,6 +116,7 @@ */ const struct trx_chan_desc trx_chan_desc[_TRX_CHAN_MAX] = { + /* is_pdch chan_type chan_nr link_id name rts_fn dl_fn ul_fn auto_active */ { 0, TRXC_IDLE, 0, LID_DEDIC, "IDLE", NULL, tx_idle_fn, NULL, 1 }, { 0, TRXC_FCCH, 0, LID_DEDIC, "FCCH", NULL, tx_fcch_fn, NULL, 1 }, { 0, TRXC_SCH, 0, LID_DEDIC, "SCH", NULL, tx_sch_fn, NULL, 1 }, @@ -154,6 +155,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, 0xc8, LID_DEDIC, "CBCH", rts_data_fn, tx_data_fn, NULL, 1 }, }; const struct value_string trx_chan_type_names[] = { @@ -195,6 +197,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: merged Gerrit-Change-Id: Icc15603079a1709ec094f400a9bcf0008211890f Gerrit-Change-Number: 10603 Gerrit-PatchSet: 6 Gerrit-Owner: Harald Welte 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 Sun Sep 9 15:41:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 15:41:00 +0000 Subject: Change in osmo-bts[master]: CBCH: Use llist_first_entry_or_null() instead of reinventing it In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10846 ) Change subject: CBCH: Use llist_first_entry_or_null() instead of reinventing it ...................................................................... CBCH: Use llist_first_entry_or_null() instead of reinventing it Change-Id: I376111e71d1c7be35a8fd7e392488adc34e21941 --- M src/common/cbch.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/cbch.c b/src/common/cbch.c index b8f69c6..56d76f1 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -144,12 +144,10 @@ { struct smscb_msg *msg; - if (llist_empty(&bts->smscb_state.queue)) + msg = llist_first_entry_or_null(&bts->smscb_state.queue, struct smscb_msg, list); + if (!msg) return NULL; - msg = llist_entry(bts->smscb_state.queue.next, - struct smscb_msg, list); - llist_del(&msg->list); return msg; -- To view, visit https://gerrit.osmocom.org/10846 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: I376111e71d1c7be35a8fd7e392488adc34e21941 Gerrit-Change-Number: 10846 Gerrit-PatchSet: 4 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 Sep 9 17:59:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 9 Sep 2018 17:59:19 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10843 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 29 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 3f4de13..7d09259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,16 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc +SUBDIRS = include src tests examples stp doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index c0cc488..af64bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,21 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -122,5 +137,7 @@ stp/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..e7d846f --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-stp.service +systemdsystemunit_DATA = \ + osmo-stp.service +endif diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index b2f8077..2c250b0 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,2 +1,3 @@ +/lib/sytemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service deleted file mode 120000 index 55f37c2..0000000 --- a/debian/osmo-stp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-stp.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index bea0a76..c0c9f0c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static + dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/10843 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: Ie77ee4b32a75e2d207030ddc78d39fb664103d33 Gerrit-Change-Number: 10843 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 jenkins at lists.osmocom.org Sun Sep 9 18:02:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:02:37 +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_#1984?= Message-ID: <142483652.16.1536516157365.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 331.13 KB...] config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' Making install in sccp make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 sccp_types.h sccp.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in mtp make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in osmocom make[3]: Entering directory ' Making install in sigtran make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h ' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h ' make[5]: Leaving directory ' make[4]: Leaving directory ' make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' 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 ' Making install in src make[2]: Entering directory ' CC sccp.o CC mtp_pcap.o CC sccp_sap.lo CC libxua_a-xua_msg.o CC sua.lo CC m3ua.lo CC xua_msg.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo sccp_scoc.c: In function ?scoc_fsm_active?: sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^~~~~~~ CC xua_default_lm_fsm.lo CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a ar: `u' modifier ignored since `D' is the default (see `U') AR libmtp.a ar: `u' modifier ignored since `D' is the default (see `U') AR libxua.a ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmo-sigtran.la ar: `u' modifier ignored since `D' is the default (see `U') make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la ' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a ' ( cd ' && ranlib libsccp.a ) ( cd ' && ranlib libmtp.a ) ( cd ' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 libtool: install: (cd && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a libtool: install: chmod 644 libtool: install: ranlib 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 tests make[2]: Entering directory ' Making install in xua make[3]: Entering directory ' CC xua_test.o CC sccp_test_data.o CCLD xua_test 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 ' Making install in sccp make[3]: Entering directory ' CC sccp_test.o CC sccp.o CCLD sccp_test 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 ' Making install in mtp make[3]: Entering directory ' CC mtp_parse_test.o CCLD mtp_parse_test 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 ' Making install in m2ua make[3]: Entering directory ' CC m2ua_test.o CCLD m2ua_test 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 ' Making install in ss7 make[3]: Entering directory ' CC ss7_test.o CCLD ss7_test 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[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 ' Making install in examples make[2]: Entering directory ' CC sccp_demo_user.o CC sccp_test_server.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in stp make[2]: Entering directory ' CC stp_main.o CCLD osmo-stp 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 osmo-stp ' libtool: install: /usr/bin/install -c .libs/osmo-stp make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in doc make[2]: Entering directory ' Making install in examples make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-stp.cfg ' make[4]: Leaving directory ' make[3]: Leaving directory ' 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 ' Making install in contrib make[2]: Entering directory ' Making install in systemd make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:328: recipe for target 'install-systemdsystemunitDATA' failed make[4]: *** [install-systemdsystemunitDATA] Error 1 make[4]: Leaving directory ' Makefile:398: recipe for target 'install-am' failed make[3]: *** [install-am] Error 2 make[3]: Leaving directory ' Makefile:362: recipe for target 'install-recursive' failed make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory ' Makefile:489: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:788: 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 Sun Sep 9 18:02:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:02:44 +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_#5648?= Message-ID: <2034383258.17.1536516164854.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 287.04 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC xua_msg.lo CC libxua_a-xua_msg.o CC sua.lo CC m3ua.lo CC sccp_sap.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_vty.o CC sccp_test_server.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 Makefile:776: 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 Sun Sep 9 18:03:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:03: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_#5447?= Message-ID: <1550521836.18.1536516183695.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 299.24 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC sccp_helpers.lo CC mtp_pcap.o CC sccp_sap.lo CC libxua_a-xua_msg.o CC sua.lo CC m3ua.lo CC xua_msg.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_server.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make: *** [install] Error 2 Makefile:776: 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 Sun Sep 9 18:03:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:03:11 +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_#5648?= Message-ID: <652157128.19.1536516191206.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 196.14 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sccp_sap.lo CC xua_msg.lo CC sccp_helpers.lo CC sua.lo CC m3ua.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC sccp_test_data.o CC xua_test.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp.o CC sccp_test.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_vty.o CC sccp_test_server.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 make[2]: *** [install-recursive] Error 1 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:776: 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 Sun Sep 9 18:03:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:03:12 +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_#2714?= Message-ID: <1782008701.20.1536516192735.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 196.28 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC libxua_a-xua_msg.o CC mtp_pcap.o CC sccp_sap.lo CC xua_msg.lo CC sua.lo CC sccp_helpers.lo CC m3ua.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC osmo_ss7.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp.o CC sccp_test.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_test_server.o CC sccp_demo_user.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 make[3]: *** [install-am] Error 2 Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:776: 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 Sun Sep 9 18:03:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:03:22 +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_#3427?= Message-ID: <942489612.21.1536516202886.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 194.06 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sccp_sap.lo CC sua.lo CC m3ua.lo CC sccp_helpers.lo CC xua_msg.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC sccp_test_data.o CC xua_test.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_vty.o CC sccp_test_server.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make: *** [install] Error 2 Makefile:776: 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 Sun Sep 9 18:03:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:03:23 +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_#2714?= Message-ID: <1873905818.22.1536516203942.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 196.29 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sccp_sap.lo CC sua.lo CC m3ua.lo CC xua_msg.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC xua_rkm.lo CC xua_default_lm_fsm.lo CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_test_server.o CC sccp_demo_user.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:386: recipe for target 'install-am' failed make[3]: *** [install-am] Error 2 make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[2]: *** [install-recursive] Error 1 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 Makefile:776: 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 Sun Sep 9 18:03:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:03: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_#2715?= In-Reply-To: <1873905818.22.1536516203942.JavaMail.jenkins@jenkins.osmocom.org> References: <1873905818.22.1536516203942.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1802095093.23.1536516232802.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 196.31 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sccp_sap.lo CC sua.lo CC m3ua.lo CC xua_msg.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC xua_rkm.lo CC xua_default_lm_fsm.lo CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_server.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 make[2]: *** [install-recursive] Error 1 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 Makefile:776: 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 Sun Sep 9 18:04:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:04:02 +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_#2715?= In-Reply-To: <1782008701.20.1536516192735.JavaMail.jenkins@jenkins.osmocom.org> References: <1782008701.20.1536516192735.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1202077614.24.1536516242094.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 195.62 KB...] config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.6-ba3d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sccp_sap.lo CC xua_msg.lo CC sua.lo CC sccp_helpers.lo CC m3ua.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:943:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/install/stow/libosmo-sccp/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/install/stow/libosmo-sccp/lib' ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libsccp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libmtp.a ) ( cd '/build/deps/install/stow/libosmo-sccp/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-sccp/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/install/stow/libosmo-sccp/lib/libosmo-sigtran.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/libosmo-sccp/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-sccp/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[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC sccp_test_data.o CC xua_test.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' 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/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' 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/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' 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/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' 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/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' 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/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' 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/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_test_server.o CC sccp_demo_user.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/install/stow/libosmo-sccp/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/install/stow/libosmo-sccp/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/install/stow/libosmo-sccp/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:316: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 make[3]: *** [install-am] Error 2 Makefile:386: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[2]: *** [install-recursive] Error 1 Makefile:350: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' Makefile:477: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:776: 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 Sun Sep 9 18:20:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 18:20:48 +0000 Subject: Change in libosmo-sccp[master]: Revert "Install systemd services with autotools" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10855 Change subject: Revert "Install systemd services with autotools" ...................................................................... Revert "Install systemd services with autotools" This reverts commit ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59. That commit broke master-{osmo-iuh,osmo-msc,osmo-sgsn,openbsc,osmo-bsc} build jobs with make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Change-Id: I009825d293e7e7a6c48d10452c10b3bb6da3e684 --- M Makefile.am M configure.ac D contrib/Makefile.am D contrib/systemd/Makefile.am M debian/osmo-stp.install A debian/osmo-stp.service M debian/rules 7 files changed, 3 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/10855/1 diff --git a/Makefile.am b/Makefile.am index 7d09259..3f4de13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,13 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc contrib +SUBDIRS = include src tests examples stp doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg -DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index af64bc0..c0cc488 100644 --- a/configure.ac +++ b/configure.ac @@ -98,21 +98,6 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") -# https://www.freedesktop.org/software/systemd/man/daemon.html -AC_ARG_WITH([systemdsystemunitdir], - [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, - [with_systemdsystemunitdir=auto]) -AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ - def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) - AS_IF([test "x$def_systemdsystemunitdir" = "x"], - [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], - [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) - with_systemdsystemunitdir=no], - [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) -AS_IF([test "x$with_systemdsystemunitdir" != "xno"], - [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) -AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) - AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -137,7 +122,5 @@ stp/Makefile doc/Makefile doc/examples/Makefile - contrib/Makefile - contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index 3439c97..0000000 --- a/contrib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am deleted file mode 100644 index e7d846f..0000000 --- a/contrib/systemd/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -if HAVE_SYSTEMD -EXTRA_DIST = osmo-stp.service -systemdsystemunit_DATA = \ - osmo-stp.service -endif diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index 2c250b0..b2f8077 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,3 +1,2 @@ -/lib/sytemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service new file mode 120000 index 0000000..55f37c2 --- /dev/null +++ b/debian/osmo-stp.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-stp.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index c0c9f0c..bea0a76 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system + dh_auto_configure -- --enable-static # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/10855 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: I009825d293e7e7a6c48d10452c10b3bb6da3e684 Gerrit-Change-Number: 10855 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 9 18:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 18:21:21 +0000 Subject: Change in libosmo-sccp[master]: Revert "Install systemd services with autotools" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10855 ) Change subject: Revert "Install systemd services with autotools" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10855 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: I009825d293e7e7a6c48d10452c10b3bb6da3e684 Gerrit-Change-Number: 10855 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 09 Sep 2018 18: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 Sun Sep 9 18:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Sep 2018 18:21:25 +0000 Subject: Change in libosmo-sccp[master]: Revert "Install systemd services with autotools" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10855 ) Change subject: Revert "Install systemd services with autotools" ...................................................................... Revert "Install systemd services with autotools" This reverts commit ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59. That commit broke master-{osmo-iuh,osmo-msc,osmo-sgsn,openbsc,osmo-bsc} build jobs with make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Change-Id: I009825d293e7e7a6c48d10452c10b3bb6da3e684 --- M Makefile.am M configure.ac D contrib/Makefile.am D contrib/systemd/Makefile.am M debian/osmo-stp.install A debian/osmo-stp.service M debian/rules 7 files changed, 3 insertions(+), 29 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/Makefile.am b/Makefile.am index 7d09259..3f4de13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,13 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc contrib +SUBDIRS = include src tests examples stp doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg -DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index af64bc0..c0cc488 100644 --- a/configure.ac +++ b/configure.ac @@ -98,21 +98,6 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") -# https://www.freedesktop.org/software/systemd/man/daemon.html -AC_ARG_WITH([systemdsystemunitdir], - [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, - [with_systemdsystemunitdir=auto]) -AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ - def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) - AS_IF([test "x$def_systemdsystemunitdir" = "x"], - [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], - [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) - with_systemdsystemunitdir=no], - [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) -AS_IF([test "x$with_systemdsystemunitdir" != "xno"], - [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) -AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) - AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -137,7 +122,5 @@ stp/Makefile doc/Makefile doc/examples/Makefile - contrib/Makefile - contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index 3439c97..0000000 --- a/contrib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am deleted file mode 100644 index e7d846f..0000000 --- a/contrib/systemd/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -if HAVE_SYSTEMD -EXTRA_DIST = osmo-stp.service -systemdsystemunit_DATA = \ - osmo-stp.service -endif diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index 2c250b0..b2f8077 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,3 +1,2 @@ -/lib/sytemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service new file mode 120000 index 0000000..55f37c2 --- /dev/null +++ b/debian/osmo-stp.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-stp.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index c0c9f0c..bea0a76 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system + dh_auto_configure -- --enable-static # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/10855 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: I009825d293e7e7a6c48d10452c10b3bb6da3e684 Gerrit-Change-Number: 10855 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 9 18:30:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:30:58 +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_#5448?= In-Reply-To: <1550521836.18.1536516183695.JavaMail.jenkins@jenkins.osmocom.org> References: <1550521836.18.1536516183695.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1804715956.30.1536517858479.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Sep 9 18:32:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:32:31 +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_#5649?= In-Reply-To: <652157128.19.1536516191206.JavaMail.jenkins@jenkins.osmocom.org> References: <652157128.19.1536516191206.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2101519894.31.1536517951468.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Sep 9 18:32:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:32:50 +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_#5649?= In-Reply-To: <2034383258.17.1536516164854.JavaMail.jenkins@jenkins.osmocom.org> References: <2034383258.17.1536516164854.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <123127759.32.1536517970686.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Sep 9 18:33:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:33:09 +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_#3428?= In-Reply-To: <942489612.21.1536516202886.JavaMail.jenkins@jenkins.osmocom.org> References: <942489612.21.1536516202886.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <902799671.33.1536517989029.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Sep 9 18:33:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:33: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_#1985?= In-Reply-To: <142483652.16.1536516157365.JavaMail.jenkins@jenkins.osmocom.org> References: <142483652.16.1536516157365.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <551991494.34.1536518011520.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Sep 9 18:34:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:34:12 +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_#2716?= In-Reply-To: <1202077614.24.1536516242094.JavaMail.jenkins@jenkins.osmocom.org> References: <1202077614.24.1536516242094.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1441621795.35.1536518052831.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Sep 9 18:34:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Sep 2018 18:34:32 +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_#2716?= In-Reply-To: <1802095093.23.1536516232802.JavaMail.jenkins@jenkins.osmocom.org> References: <1802095093.23.1536516232802.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <563602090.36.1536518072251.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Sun Sep 9 19:56:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:56:40 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b957af952f25_1c0c4d068454992b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 93s] No package 'libpcsclite' found [ 93s] simtrace2-remsim.o: In function `main': [ 93s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 93s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 93s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 93s] apdu_dispatch.o: In function `apdu_segment_in': [ 93s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 93s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 93s] collect2: error: ld returned 1 exit status [ 93s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 93s] make[2]: *** [simtrace2-remsim] Error 1 [ 93s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 93s] Makefile:20: recipe for target 'utils' failed [ 93s] make[1]: *** [utils] Error 2 [ 93s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 93s] dh_auto_build: make -j1 returned exit code 2 [ 93s] debian/rules:4: recipe for target 'build' failed [ 93s] make: *** [build] Error 2 [ 93s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 93s] [ 93s] build82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:34 UTC 2018. [ 93s] [ 93s] ### VM INTERACTION START ### [ 96s] [ 88.531769] sysrq: SysRq : Power Off [ 96s] [ 88.534818] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] build82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:38 UTC 2018. [ 96s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:56:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:56:40 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b957af913b27_1c0c4d0684549815@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 135s] No package 'libpcsclite' found [ 135s] simtrace2-remsim.o: In function `main': [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 135s] apdu_dispatch.o: In function `apdu_segment_in': [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 135s] collect2: error: ld returned 1 exit status [ 135s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 135s] make[2]: *** [simtrace2-remsim] Error 1 [ 135s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 135s] Makefile:20: recipe for target 'utils' failed [ 135s] make[1]: *** [utils] Error 2 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] dh_auto_build: make -j1 returned exit code 2 [ 135s] debian/rules:4: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] lamb14 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:33 UTC 2018. [ 135s] [ 135s] ### VM INTERACTION START ### [ 138s] [ 128.905730] sysrq: SysRq : Power Off [ 138s] [ 128.913386] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb14 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:36 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:56:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:56:40 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b957af8c5640_1c0c4d068454976c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 138s] No package 'libpcsclite' found [ 138s] simtrace2-remsim.o: In function `main': [ 138s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 138s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 138s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 138s] apdu_dispatch.o: In function `apdu_segment_in': [ 138s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 138s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 138s] collect2: error: ld returned 1 exit status [ 138s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 138s] make[2]: *** [simtrace2-remsim] Error 1 [ 138s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 138s] Makefile:20: recipe for target 'utils' failed [ 138s] make[1]: *** [utils] Error 2 [ 138s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 138s] dh_auto_build: make -j1 returned exit code 2 [ 138s] debian/rules:4: recipe for target 'build' failed [ 138s] make: *** [build] Error 2 [ 138s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 138s] [ 138s] lamb51 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:31 UTC 2018. [ 138s] [ 138s] ### VM INTERACTION START ### [ 141s] [ 131.158244] sysrq: SysRq : Power Off [ 141s] [ 131.165260] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 141s] [ 141s] lamb51 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:35 UTC 2018. [ 141s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:56:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:56:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b957b12d7cec_1c0c4d06845500e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 138s] No package 'libpcsclite' found [ 138s] simtrace2-remsim.o: In function `main': [ 138s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 138s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 138s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 138s] apdu_dispatch.o: In function `apdu_segment_in': [ 138s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 138s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 138s] collect2: error: ld returned 1 exit status [ 138s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 138s] make[2]: *** [simtrace2-remsim] Error 1 [ 138s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 138s] Makefile:20: recipe for target 'utils' failed [ 138s] make[1]: *** [utils] Error 2 [ 138s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 138s] dh_auto_build: make -j1 returned exit code 2 [ 138s] debian/rules:4: recipe for target 'build' failed [ 138s] make: *** [build] Error 2 [ 138s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 138s] [ 138s] lamb55 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:41 UTC 2018. [ 138s] [ 138s] ### VM INTERACTION START ### [ 141s] [ 130.362257] sysrq: SysRq : Power Off [ 141s] [ 130.369976] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 142s] [ 142s] lamb55 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:46 UTC 2018. [ 142s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:57:14 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:57:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b957b314a0c1_1c0c4d06845501d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 108s] No package 'libpcsclite' found [ 108s] simtrace2-remsim.o: In function `main': [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 108s] apdu_dispatch.o: In function `apdu_segment_in': [ 108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 108s] collect2: error: ld returned 1 exit status [ 108s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 108s] make[2]: *** [simtrace2-remsim] Error 1 [ 108s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 108s] Makefile:20: recipe for target 'utils' failed [ 108s] make[1]: *** [utils] Error 2 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 108s] dh_auto_build: make -j1 returned exit code 2 [ 108s] debian/rules:4: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 108s] [ 108s] sheep83 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:56:59 UTC 2018. [ 108s] [ 108s] ### VM INTERACTION START ### [ 112s] [ 104.623132] sysrq: SysRq : Power Off [ 112s] [ 104.629015] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] sheep83 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:57:02 UTC 2018. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:57:31 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:57:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b957b3283ae2_1c0c4d0684550366@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 159s] No package 'libpcsclite' found [ 159s] simtrace2-remsim.o: In function `main': [ 159s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 159s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 159s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 159s] apdu_dispatch.o: In function `apdu_segment_in': [ 159s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 159s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 159s] collect2: error: ld returned 1 exit status [ 159s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 159s] make[2]: *** [simtrace2-remsim] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 159s] Makefile:20: recipe for target 'utils' failed [ 159s] make[1]: *** [utils] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: make -j1 returned exit code 2 [ 159s] debian/rules:4: recipe for target 'build' failed [ 159s] make: *** [build] Error 2 [ 159s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 159s] [ 159s] lamb62 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:57:10 UTC 2018. [ 159s] [ 159s] ### VM INTERACTION START ### [ 162s] [ 151.785922] sysrq: SysRq : Power Off [ 162s] [ 151.793112] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] lamb62 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:57:14 UTC 2018. [ 162s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:57:48 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:57:48 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b957b51e4d7_1c0c4d06845504cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 133s] No package 'libpcsclite' found [ 133s] simtrace2-remsim.o: In function `main': [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 133s] apdu_dispatch.o: In function `apdu_segment_in': [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 133s] collect2: error: ld returned 1 exit status [ 133s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 133s] make[2]: *** [simtrace2-remsim] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 133s] Makefile:20: recipe for target 'utils' failed [ 133s] make[1]: *** [utils] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] dh_auto_build: make -j1 returned exit code 2 [ 133s] debian/rules:4: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:57:32 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 127.063976] sysrq: SysRq : Power Off [ 136s] [ 127.075381] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:57:36 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 9 19:58:23 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 19:58:23 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b957b6facdc7_1c0c4d06845507d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 169s] No package 'libpcsclite' found [ 169s] simtrace2-remsim.o: In function `main': [ 169s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 169s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 169s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 169s] apdu_dispatch.o: In function `apdu_segment_in': [ 169s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 169s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 169s] collect2: error: ld returned 1 exit status [ 169s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 169s] make[2]: *** [simtrace2-remsim] Error 1 [ 169s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 169s] Makefile:20: recipe for target 'utils' failed [ 169s] make[1]: *** [utils] Error 2 [ 169s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 169s] dh_auto_build: make -j1 returned exit code 2 [ 169s] debian/rules:4: recipe for target 'build' failed [ 169s] make: *** [build] Error 2 [ 169s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 169s] [ 169s] cloud122 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:58:05 UTC 2018. [ 169s] [ 169s] ### VM INTERACTION START ### [ 172s] [ 149.010531] sysrq: SysRq : Power Off [ 172s] [ 149.022424] reboot: Power down [ 174s] ### VM INTERACTION END ### [ 174s] [ 174s] cloud122 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 19:58:10 UTC 2018. [ 174s] -- 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 Sep 9 20:34:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 9 Sep 2018 20:34:45 +0000 Subject: Change in libosmo-sccp[master]: Revert "Install systemd services with autotools" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10855 ) Change subject: Revert "Install systemd services with autotools" ...................................................................... Patch Set 1: We need to add "--with-systemdsystemunitdir=$prefix/lib/sytemd/system" or similar in osmo-ci build scripts, I'll do it tomorrow morning. -- To view, visit https://gerrit.osmocom.org/10855 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: I009825d293e7e7a6c48d10452c10b3bb6da3e684 Gerrit-Change-Number: 10855 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 09 Sep 2018 20:34:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Sep 9 22:19:49 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 09 Sep 2018 22:19:49 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b959c9927896_1c0c4d06845587a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 234s] No package 'libpcsclite' found [ 234s] simtrace2-remsim.o: In function `main': [ 234s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 234s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 234s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 234s] apdu_dispatch.o: In function `apdu_segment_in': [ 234s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 234s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 234s] collect2: error: ld returned 1 exit status [ 234s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 234s] make[2]: *** [simtrace2-remsim] Error 1 [ 234s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 234s] Makefile:20: recipe for target 'utils' failed [ 234s] make[1]: *** [utils] Error 2 [ 234s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 234s] dh_auto_build: make -j1 returned exit code 2 [ 234s] debian/rules:4: recipe for target 'build' failed [ 234s] make: *** [build] Error 2 [ 234s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 234s] [ 234s] armbuild24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 22:19:35 UTC 2018. [ 234s] [ 234s] ### VM INTERACTION START ### [ 237s] [ 224.716245] SysRq : Power Off [ 237s] [ 224.717424] reboot: Power down [ 237s] ### VM INTERACTION END ### [ 237s] [ 237s] armbuild24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 9 22:19:38 UTC 2018. [ 237s] -- 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 Sep 10 00:51:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 00:51:35 +0000 Subject: Change in osmo-bsc[master]: ho fsm: handle RR HO Failure for inter-BSC outgoing In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10834 ) Change subject: ho fsm: handle RR HO Failure for inter-BSC outgoing ...................................................................... ho fsm: handle RR HO Failure for inter-BSC outgoing Before, this would ignore the failure and hit a timeout instead. Rather handle the event directly. Change-Id: I21c43d2907d0413ef18ec43cf27f680ebecf9e82 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Harald Welte: 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 a42f10c..9d558bc 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1025,6 +1025,18 @@ } } +static void ho_out_fsm_wait_clear(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_subscriber_connection *conn = ho_fi_conn(fi); + switch (event) { + case HO_EV_RR_HO_FAIL: + ho_fail(HO_RESULT_FAIL_RR_HO_FAIL, "Received RR Handover Failure message"); + return; + + default: + OSMO_ASSERT(false); + } +} #define S(x) (1 << (x)) @@ -1108,6 +1120,10 @@ }, [HO_OUT_ST_WAIT_CLEAR] = { .name = "inter-BSC-OUT:WAIT_CLEAR", + .in_event_mask = 0 + | S(HO_EV_RR_HO_FAIL) + , + .action = ho_out_fsm_wait_clear, }, }; -- To view, visit https://gerrit.osmocom.org/10834 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: I21c43d2907d0413ef18ec43cf27f680ebecf9e82 Gerrit-Change-Number: 10834 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 Sep 10 00:51:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 00:51:36 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: allow late RTP release events without erroring In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10835 ) Change subject: lchan_fsm: allow late RTP release events without erroring ...................................................................... lchan_fsm: allow late RTP release events without erroring Change-Id: Ia463f97402b957bd13a95d18d291d1c1f006f089 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 7d47380..1ef7869 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -967,6 +967,10 @@ lchan_fsm_state_chg(LCHAN_ST_UNUSED); break; + case LCHAN_EV_RTP_RELEASED: + /* ignore late lchan_rtp_fsm release events */ + return; + default: OSMO_ASSERT(false); } @@ -1119,6 +1123,7 @@ .name = "WAIT_BEFORE_RF_RELEASE", .in_event_mask = 0 | S(LCHAN_EV_RLL_REL_IND) /* allow late REL_IND of SAPI[0] */ + | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) @@ -1131,6 +1136,7 @@ .action = lchan_fsm_wait_rf_release_ack, .in_event_mask = 0 | S(LCHAN_EV_RSL_RF_CHAN_REL_ACK) + | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) @@ -1140,6 +1146,9 @@ }, [LCHAN_ST_WAIT_AFTER_ERROR] = { .name = "WAIT_AFTER_ERROR", + .in_event_mask = 0 + | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ + , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) , -- To view, visit https://gerrit.osmocom.org/10835 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: Ia463f97402b957bd13a95d18d291d1c1f006f089 Gerrit-Change-Number: 10835 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 Sep 10 01:02:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 01:02:50 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI host (-i) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI host (-i) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Sep 2018 01:02:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 01:08:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 01:08:45 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI remote host (-i) 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/10808 to look at the new patch set (#2). Change subject: add vty config for GSMTAP-SAPI remote host (-i) ...................................................................... add vty config for GSMTAP-SAPI remote host (-i) So far, the only way to configure the target for SAPI GSMTAP is to use the cmdline argument -i. Add a vty command to allow configuring from cfg file. Add 'bts 0' / 'gsmtap-remote-host HOSTNAME' and 'no gsmtap-remote-host'. The -i option, if provided, overrides the cfg file option. In order to set up the SAPI GSMTAP socket after reading the config file, shift the socket init a bit further down in main.c. BTW, if the user passed an -i option, the gsmtap host shows up in 'show running-config' and hence will also appear in 'write file'. Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 --- M include/osmo-bts/gsm_data_shared.h M src/common/main.c M src/common/vty.c 3 files changed, 52 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10808/2 -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 08:36:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 08:36:55 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane way for non-trivially copyable types 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/10721 to look at the new patch set (#3). Change subject: Vector: Copy arrays in a sane way for non-trivially copyable types ...................................................................... Vector: Copy arrays in a sane way for 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/3 -- 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: newpatchset Gerrit-Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c Gerrit-Change-Number: 10721 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 08:36:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 08:36:56 +0000 Subject: Change in osmo-trx[master]: cosmetic: Use proper whitespace in several for loops Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10856 Change subject: cosmetic: Use proper whitespace in several for loops ...................................................................... cosmetic: Use proper whitespace in several for loops Change-Id: I82bdeb8a3fa38f3d125e8cbccc3eddbf2b8d8f58 --- M Transceiver52M/device/usrp1/USRPDevice.cpp M tests/Transceiver52M/convolve_test.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/56/10856/1 diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 758ee55..5d19514 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -398,7 +398,7 @@ // read USRP packets, parse and save A/D data as needed readLen = m_uRx->read((void *)readBuf,readLen,overrun); - for(int pktNum = 0; pktNum < (readLen/512); pktNum++) { + for (int pktNum = 0; pktNum < (readLen/512); pktNum++) { // tmpBuf points to start of a USB packet uint32_t* tmpBuf = (uint32_t *) (readBuf+pktNum*512/4); TIMESTAMP pktTimestamp = usrp_to_host_u32(tmpBuf[1]); diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c index 88624af..54bc7a1 100644 --- a/tests/Transceiver52M/convolve_test.c +++ b/tests/Transceiver52M/convolve_test.c @@ -18,7 +18,7 @@ void gen_floats(float *vect, int len) { int i; - for(i=0;i -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 08:59:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 08:59:05 +0000 Subject: Change in osmo-ci[master]: osmo-build-dep.sh: Let autotools install systemd services to correct ... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10857 Change subject: osmo-build-dep.sh: Let autotools install systemd services to correct path ...................................................................... osmo-build-dep.sh: Let autotools install systemd services to correct path Change-Id: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c --- M scripts/osmo-build-dep.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/10857/1 diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 35cb373..7f90b1f 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -49,7 +49,7 @@ mkdir -p "$inst/stow" autoreconf --install --force -./configure --prefix="$inst/stow/$project" $cfg +./configure --prefix="$inst/stow/$project" --with-systemdsystemunitdir="$inst/stow/$project/lib/sytemd/system" $cfg $MAKE $PARALLEL_MAKE install # Make the dependencies available through symlinks in $deps ($PWD/..). -- To view, visit https://gerrit.osmocom.org/10857 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: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c Gerrit-Change-Number: 10857 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 Sep 10 09:00:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 09:00:06 +0000 Subject: Change in libosmo-sccp[master]: Revert "Revert "Install systemd services with autotools"" Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10858 Change subject: Revert "Revert "Install systemd services with autotools"" ...................................................................... Revert "Revert "Install systemd services with autotools"" This reverts commit c8143eccc2841781af2f09f31222fcc634114bd5. The commit is fine, we just need to add some extra configure flags in osmo-ci.git. Depends on https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/ Change-Id: Ifc11d97c0c5fe1f7872b59147b1548b56951921b --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/58/10858/1 diff --git a/Makefile.am b/Makefile.am index 3f4de13..7d09259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,16 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc +SUBDIRS = include src tests examples stp doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index c0cc488..af64bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,21 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -122,5 +137,7 @@ stp/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..e7d846f --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-stp.service +systemdsystemunit_DATA = \ + osmo-stp.service +endif diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index b2f8077..2c250b0 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,2 +1,3 @@ +/lib/sytemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service deleted file mode 120000 index 55f37c2..0000000 --- a/debian/osmo-stp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-stp.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index bea0a76..c0c9f0c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static + dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/10858 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: Ifc11d97c0c5fe1f7872b59147b1548b56951921b Gerrit-Change-Number: 10858 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 Sep 10 09:01:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 09:01:12 +0000 Subject: Change in libosmo-sccp[master]: Revert "Install systemd services with autotools" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10855 ) Change subject: Revert "Install systemd services with autotools" ...................................................................... Patch Set 1: See: https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/ https://gerrit.osmocom.org/#/c/libosmo-sccp/+/10858/ -- To view, visit https://gerrit.osmocom.org/10855 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: I009825d293e7e7a6c48d10452c10b3bb6da3e684 Gerrit-Change-Number: 10855 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Sep 2018 09:01:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 10:05:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 10:05:57 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Remove duplicated override_dh_auto_test section Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10859 Change subject: debian/rules: Remove duplicated override_dh_auto_test section ...................................................................... debian/rules: Remove duplicated override_dh_auto_test section Change-Id: Iaf3a7448d10832cc27afa04fe482da31d7582660 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/10859/1 diff --git a/debian/rules b/debian/rules index c0c9f0c..65d4700 100755 --- a/debian/rules +++ b/debian/rules @@ -19,10 +19,6 @@ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install -# Print test results in case of a failure -override_dh_auto_test: - dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) - override_dh_auto_configure: dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system -- To view, visit https://gerrit.osmocom.org/10859 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: Iaf3a7448d10832cc27afa04fe482da31d7582660 Gerrit-Change-Number: 10859 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 Sep 10 10:50:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 10:50:23 +0000 Subject: Change in osmo-mgw[master]: debian: Remove dangling symlink to osmo-bsc-mgcp.service Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10860 Change subject: debian: Remove dangling symlink to osmo-bsc-mgcp.service ...................................................................... debian: Remove dangling symlink to osmo-bsc-mgcp.service osmo-bsc-mgcp was removed recently from osmo-mgw.git as it belongs to openbsc.git. This symlink was a leftover from that time. Change-Id: Ifdcb266efd821eac9d90aff186400f85751e8f42 --- D debian/osmo-bsc-mgcp.service 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/60/10860/1 diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service deleted file mode 120000 index eb73b7b..0000000 --- a/debian/osmo-bsc-mgcp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10860 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: Ifdcb266efd821eac9d90aff186400f85751e8f42 Gerrit-Change-Number: 10860 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 Sep 10 11:40:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 11:40:22 +0000 Subject: Change in osmo-mgw[master]: log: avoid logging early media as error Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10861 Change subject: log: avoid logging early media as error ...................................................................... log: avoid logging early media as error When the peer address is still 0.0.0.0, the endpoint is not yet configured. This commonly happens before bridging a call is complete, so instead of ERROR logging about an invalid packet, rather INFO-log this as "early media". Related: OS#3539 Change-Id: I335f6453bd599be76eef08fcf9e5daed071e5b6d --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/10861/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index a73209b..d769ef3 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -874,19 +874,32 @@ 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; + if (memcmp(&zero_addr, &conn->end.addr, sizeof(zero_addr)) == 0) { + switch (conn->conn->mode) { + case 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; + + default: + /* Receiving early media before the endpoint is configured. Instead of logging + * this as an error that occurs on every call, keep it more low profile to not + * confuse humans with expected errors. */ + LOGP(DRTP, LOGL_INFO, + "endpoint:0x%x I:%s Rx RTP from %s, but remote address not set:" + " dropping early media\n", + ENDPOINT_NUMBER(endp), conn->conn->id, inet_ntoa(addr->sin_addr)); + return -1; + } } /* Note: Check if the inbound RTP data comes from the same host to -- To view, visit https://gerrit.osmocom.org/10861 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: I335f6453bd599be76eef08fcf9e5daed071e5b6d Gerrit-Change-Number: 10861 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 11:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 11:45:47 +0000 Subject: Change in libosmo-sccp[master]: Revert "Revert "Install systemd services with autotools"" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10858 ) Change subject: Revert "Revert "Install systemd services with autotools"" ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/10858/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10858/1//COMMIT_MSG at 9 PS1, Line 9: This reverts commit c8143eccc2841781af2f09f31222fcc634114bd5. "and hence re-adds commit xxx" ? https://gerrit.osmocom.org/#/c/10858/1//COMMIT_MSG at 14 PS1, Line 14: Depends on https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/ "Depends: (osmo-ci)" -- To view, visit https://gerrit.osmocom.org/10858 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: Ifc11d97c0c5fe1f7872b59147b1548b56951921b Gerrit-Change-Number: 10858 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 10 Sep 2018 11:45:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 12:44:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Sep 2018 12:44:05 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/10862 Change subject: debian-repo-install-test: new binary package test ...................................................................... debian-repo-install-test: new binary package test Installs all packages from the Debian repository into a plain debian:stretch container. The list of packages is automatically generated with aptitude, so the job does not need to be changed for every new package. The feed ("latest", "nightly") can be specified with the FEED environment variable in the jenkins.sh (defaults to nightly). Change-Id: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Relates: OS#3176 --- A debian-repo-install-test/jenkins.sh A debian-repo-install-test/testdata/Release.key A debian-repo-install-test/testdata/repo-install-test.sh 3 files changed, 90 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/10862/1 diff --git a/debian-repo-install-test/jenkins.sh b/debian-repo-install-test/jenkins.sh new file mode 100755 index 0000000..8c497bf --- /dev/null +++ b/debian-repo-install-test/jenkins.sh @@ -0,0 +1,18 @@ +#!/bin/sh +. ../jenkins-common.sh + +# Configuration +[ -z "$FEED" ] && FEED="nightly" +interactive="false" + +# Run the container +extra_args="" +[ "$interactive" = "true" ] && extra_args="-it" +docker run --rm \ + -v "$PWD/testdata:/testdata:ro" \ + -v "$VOL_BASE_DIR:/data" \ + --entrypoint "/testdata/repo-install-test.sh" \ + --name "${BUILD_TAG}" \ + -e FEED="$FEED" \ + $extra_args \ + debian:stretch diff --git a/debian-repo-install-test/testdata/Release.key b/debian-repo-install-test/testdata/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/debian-repo-install-test/testdata/Release.key @@ -0,0 +1,20 @@ +-----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----- diff --git a/debian-repo-install-test/testdata/repo-install-test.sh b/debian-repo-install-test/testdata/repo-install-test.sh new file mode 100755 index 0000000..b1585db --- /dev/null +++ b/debian-repo-install-test/testdata/repo-install-test.sh @@ -0,0 +1,52 @@ +#!/bin/sh -e + +HTTP="http://download.opensuse.org/repositories/network:/osmocom:/$FEED/Debian_9.0/" +OBS="obs://build.opensuse.org/network:osmocom:$FEED/Debian_9.0" + +check_env() { + if [ -n "$FEED" ]; then + echo "Checking feed: $FEED" + else + echo "ERROR: missing environment variable \$FEED!" + exit 1 + fi +} + +install_depends() { + echo "Installing dependencies" + apt-get update + apt-get install -y gnupg aptitude +} + +configure_osmocom_repo() { + echo "Configuring Osmocom repository" + apt-key add /testdata/Release.key + echo "deb $HTTP ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list + apt-get update +} + +install_all_repo_packages() { + echo "Installing all repository packages" + + # Reference for aptitude search patterns: + # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html + aptitude search -F%p \ + "?origin($OBS) ?architecture(native)" > /data/osmocom_packages.txt + + apt install -y $(cat /data/osmocom_packages.txt) +} + +finish() { + echo "Test finished successfully!" + if [ -t 0 ]; then + echo "Dropping to interactive shell" + bash + fi +} + +check_env +install_depends +configure_osmocom_repo +install_all_repo_packages +finish -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 12:51:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Sep 2018 12:51:34 +0000 Subject: Change in docker-playground[master]: WIP: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10862 ) Change subject: WIP: debian-repo-install-test: new binary package test ...................................................................... WIP: debian-repo-install-test: new binary package test Installs all packages from the Debian repository into a plain debian:stretch container. The list of packages is automatically generated with aptitude, so the job does not need to be changed for every new package. The feed ("latest", "nightly") can be specified with the FEED environment variable in the jenkins.sh (defaults to nightly). Work in progress: * there are some errors when actually installing the packages * these need to be fixed in the binary repository before this job can be developed further or activated * missing feature: call "--version" on all Osmocom binaries Change-Id: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Relates: OS#3176 --- A debian-repo-install-test/jenkins.sh A debian-repo-install-test/testdata/Release.key A debian-repo-install-test/testdata/repo-install-test.sh 3 files changed, 90 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/10862/2 -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 12:53:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 12:53:12 +0000 Subject: Change in osmo-pcu[master]: configure.ac: Set CXXFLAGS during --enable-sanitize Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10863 Change subject: configure.ac: Set CXXFLAGS during --enable-sanitize ...................................................................... configure.ac: Set CXXFLAGS during --enable-sanitize For some unknown reason ld was failing to find some asan symbols until I enabled asan too in CXXFLAGS. Change-Id: I695314b284277674dc336b40765313a37d238d6e --- M configure.ac 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/63/10863/1 diff --git a/configure.ac b/configure.ac index 69e0775..7288c24 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ if test x"$sanitize" = x"yes" then CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CXXFLAGS="$CXXFLAGS -fsanitize=address -fsanitize=undefined" CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" LDFLAGS="$LDFLAGS -fsanitize=address -fsanitize=undefined" fi @@ -156,8 +157,10 @@ STD_DEFINES_AND_INCLUDES="-Wall" AC_SUBST(STD_DEFINES_AND_INCLUDES) -AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) +AC_MSG_RESULT([CFLAGS="$CFLAGS"]) +AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) +AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) AC_OUTPUT( osmo-pcu.pc -- To view, visit https://gerrit.osmocom.org/10863 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: I695314b284277674dc336b40765313a37d238d6e Gerrit-Change-Number: 10863 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 Sep 10 13:21:04 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 10 Sep 2018 13:21:04 +0000 Subject: Change in osmo-bts[master]: Feed the actual pchan type to bts_supports_cm() Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10864 Change subject: Feed the actual pchan type to bts_supports_cm() ...................................................................... Feed the actual pchan type to bts_supports_cm() In rsl_rx_mode_modif(), bts_supports_cm() should never be fed with dynamic pchan kinds. Feed instead the return value of ts_pchan() that is to say, the actual pchan type. Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 --- M src/common/bts.c M src/common/rsl.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10864/1 diff --git a/src/common/bts.c b/src/common/bts.c index bec611c..55b7fa7 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -731,6 +731,8 @@ /* Invalid speech codec type => Not supported! */ return 0; } + } else { + LOGP(DRSL, LOGL_DEBUG, "%s: Invalid pchan(%s)\n", __func__, gsm_pchan_name(pchan)); } /* Check if the feature is supported by this BTS */ diff --git a/src/common/rsl.c b/src/common/rsl.c index c6c00ea..451b54e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1498,8 +1498,9 @@ cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE); lchan_tchmode_from_cmode(lchan, cm); - if (bts_supports_cm(lchan->ts->trx->bts, lchan->ts->pchan, lchan->tch_mode) != 1) { - LOGP(DRSL, LOGL_ERROR, "invalid mode/codec instructed by BSC, check BSC configuration.\n"); + if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) { + LOGP(DRSL, LOGL_ERROR, "BTS %d: invalid mode(%s)/codec(%s) instructed by BSC, check BSC configuration.\n", + lchan->ts->trx->bts->nr, gsm_pchan_name(lchan->ts->pchan), gsm48_chan_mode_name(lchan->tch_mode)); return rsl_tx_mode_modif_nack(lchan, RSL_ERR_SERV_OPT_UNAVAIL); } -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 13:24:50 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 10 Sep 2018 13:24:50 +0000 Subject: Change in osmo-bts[master]: Feed the actual pchan type to bts_supports_cm() In-Reply-To: References: Message-ID: Keith Whyte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10864 ) Change subject: Feed the actual pchan type to bts_supports_cm() ...................................................................... Feed the actual pchan type to bts_supports_cm() In rsl_rx_mode_modif(), bts_supports_cm() should never be fed with dynamic pchan kinds. Feed instead the return value of ts_pchan() that is to say, the actual pchan type. Also adds logging of pchan and chan mode types and a notification in bts_supports_cm() should it be fed with an unhandled pchan type. Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 --- M src/common/bts.c M src/common/rsl.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10864/2 -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 13:38:29 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 10 Sep 2018 13:38:29 +0000 Subject: Change in osmo-bts[master]: fix RSL Chan Mode Modif for dyn TS 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/10864 to look at the new patch set (#3). Change subject: fix RSL Chan Mode Modif for dyn TS ...................................................................... fix RSL Chan Mode Modif for dyn TS In rsl_rx_mode_modif(), bts_supports_cm() should never be fed with dynamic pchan kinds. Feed instead the return value of ts_pchan() that is to say, the actual pchan type. Also adds logging of pchan and chan mode types and a notification in bts_supports_cm() should it be fed with an unhandled pchan type. Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 --- M src/common/bts.c M src/common/rsl.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10864/3 -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte 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 Sep 10 13:54:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 13:54:48 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/vty.py: fix parsing of vty logging Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10865 Change subject: osmo_interact/vty.py: fix parsing of vty logging ...................................................................... osmo_interact/vty.py: fix parsing of vty logging Because the VTY logging target currently prints '\n\r' instead of '\r\n', the python splitlines() separates those as interleaving empty lines. Ignore '\r' to allow verifying VTY logging output as well. Change-Id: I8de9cebaa9aad275f65c3672985b7cbca343b5a6 --- M osmopy/osmo_interact/vty.py 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/65/10865/1 diff --git a/osmopy/osmo_interact/vty.py b/osmopy/osmo_interact/vty.py index 4704c09..e66ed22 100755 --- a/osmopy/osmo_interact/vty.py +++ b/osmopy/osmo_interact/vty.py @@ -110,7 +110,13 @@ last_line = "%s%s" % (last_line, new_data) if last_line: - lines = last_line.splitlines() + # Separate the received response into lines. + # But note: the VTY logging currently separates with '\n\r', not '\r\n', + # see _vty_output() in libosmocore logging_vty.c. + # So we need to jump through hoops to not separate 'abc\n\rdef' as + # [ 'abc', '', 'def' ]; but also not to convert '\r\n\r\n' to '\r\n\n' ('\r{\r\n}\n') + # Simplest is to just drop all the '\r' and only care about the '\n'. + lines = last_line.replace('\r', '').splitlines() received_lines.extend(lines[:-1]) last_line = lines[-1] -- To view, visit https://gerrit.osmocom.org/10865 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: I8de9cebaa9aad275f65c3672985b7cbca343b5a6 Gerrit-Change-Number: 10865 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 13:54:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 13:54:49 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/common: ignore trailing empty lines in received results Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10866 Change subject: osmo_interact/common: ignore trailing empty lines in received results ...................................................................... osmo_interact/common: ignore trailing empty lines in received results If the VTY/CTRL output contains trailing newlines, do not cause those to trigger mismatch errors, rather drop those. Rationale: in transcript scripts, the amount of empty lines between expected results is ignored, to allow cosmetically arranging into sections. So trailing newlines are dropped, and there is no way to preserve those. Change-Id: I1930868451c5738b17e318a9807590d948210b9a --- M osmopy/osmo_interact/common.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/66/10866/1 diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index 31f44a8..349051e 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -268,6 +268,10 @@ e += 1 g += 1 + # ignore final empty lines, we also strip empty lines from the expected string + while g < len(got) and not got[g]: + g += 1 + if g < len(got): return 'Did not expect line %r' % got[g] return True -- To view, visit https://gerrit.osmocom.org/10866 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: I1930868451c5738b17e318a9807590d948210b9a Gerrit-Change-Number: 10866 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 14:06:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 14:06:50 +0000 Subject: Change in osmo-ci[master]: osmo-build-dep.sh: Let autotools install systemd services to correct ... In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10857 ) Change subject: osmo-build-dep.sh: Let autotools install systemd services to correct path ...................................................................... osmo-build-dep.sh: Let autotools install systemd services to correct path Change-Id: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c --- M scripts/osmo-build-dep.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/10857/2 -- To view, visit https://gerrit.osmocom.org/10857 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: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c Gerrit-Change-Number: 10857 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 14:09:37 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 10 Sep 2018 14:09:37 +0000 Subject: Change in osmo-bts[master]: fix RSL Chan Mode Modif for dyn TS 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/10864 to look at the new patch set (#4). Change subject: fix RSL Chan Mode Modif for dyn TS ...................................................................... fix RSL Chan Mode Modif for dyn TS In rsl_rx_mode_modif(), bts_supports_cm() should never be fed with dynamic pchan kinds. Feed instead the return value of ts_pchan() that is to say, the actual pchan type. Also adds logging of pchan and chan mode types on error in rsl_rx_mode_modif() and debug level log notification from bts_supports_cm() should it be fed with an unhandled pchan type. Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 --- M src/common/bts.c M src/common/rsl.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10864/4 -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte 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 Sep 10 14:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:56:51 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/vty.py: fix parsing of vty logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10865 ) Change subject: osmo_interact/vty.py: fix parsing of vty logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10865 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: I8de9cebaa9aad275f65c3672985b7cbca343b5a6 Gerrit-Change-Number: 10865 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 10 Sep 2018 14:56:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 14:56:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:56:57 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/common: ignore trailing empty lines in received results In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10866 ) Change subject: osmo_interact/common: ignore trailing empty lines in received results ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10866 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: I1930868451c5738b17e318a9807590d948210b9a Gerrit-Change-Number: 10866 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 10 Sep 2018 14:56:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 14:57:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:57:32 +0000 Subject: Change in osmo-pcu[master]: configure.ac: Set CXXFLAGS during --enable-sanitize In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10863 ) Change subject: configure.ac: Set CXXFLAGS during --enable-sanitize ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10863 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: I695314b284277674dc336b40765313a37d238d6e Gerrit-Change-Number: 10863 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 10 Sep 2018 14:57:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 14:57:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:57:34 +0000 Subject: Change in osmo-pcu[master]: configure.ac: Set CXXFLAGS during --enable-sanitize In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10863 ) Change subject: configure.ac: Set CXXFLAGS during --enable-sanitize ...................................................................... configure.ac: Set CXXFLAGS during --enable-sanitize For some unknown reason ld was failing to find some asan symbols until I enabled asan too in CXXFLAGS. Change-Id: I695314b284277674dc336b40765313a37d238d6e --- M configure.ac 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 69e0775..7288c24 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ if test x"$sanitize" = x"yes" then CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CXXFLAGS="$CXXFLAGS -fsanitize=address -fsanitize=undefined" CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" LDFLAGS="$LDFLAGS -fsanitize=address -fsanitize=undefined" fi @@ -156,8 +157,10 @@ STD_DEFINES_AND_INCLUDES="-Wall" AC_SUBST(STD_DEFINES_AND_INCLUDES) -AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) +AC_MSG_RESULT([CFLAGS="$CFLAGS"]) +AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) +AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) AC_OUTPUT( osmo-pcu.pc -- To view, visit https://gerrit.osmocom.org/10863 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: I695314b284277674dc336b40765313a37d238d6e Gerrit-Change-Number: 10863 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 Sep 10 14:58:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:58:53 +0000 Subject: Change in docker-playground[master]: WIP: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: WIP: debian-repo-install-test: new binary package test ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 10 Sep 2018 14:58: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 Sep 10 14:59:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:59:18 +0000 Subject: Change in osmo-trx[master]: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10717 ) Change subject: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp ...................................................................... Patch Set 3: Code-Review+2 -- 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: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Sep 2018 14:59: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 Sep 10 14:59:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 14:59:36 +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 3: Code-Review+2 -- 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: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Sep 2018 14:59:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 15:00:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 15:00:20 +0000 Subject: Change in osmo-ci[master]: osmo-build-dep.sh: Let autotools install systemd services to correct ... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10857 ) Change subject: osmo-build-dep.sh: Let autotools install systemd services to correct path ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10857 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: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c Gerrit-Change-Number: 10857 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 10 Sep 2018 15:00: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 Sep 10 15:01:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 15:01:01 +0000 Subject: Change in osmo-mgw[master]: log: avoid logging early media as error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10861 ) Change subject: log: avoid logging early media as error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10861 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: I335f6453bd599be76eef08fcf9e5daed071e5b6d Gerrit-Change-Number: 10861 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 10 Sep 2018 15:01: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 Sep 10 15:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:05:50 +0000 Subject: Change in osmo-ci[master]: osmo-build-dep.sh: Let autotools install systemd services to correct ... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10857 ) Change subject: osmo-build-dep.sh: Let autotools install systemd services to correct path ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/10857 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: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c Gerrit-Change-Number: 10857 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Sep 2018 15:05: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 Sep 10 15:05:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:05:52 +0000 Subject: Change in osmo-ci[master]: osmo-build-dep.sh: Let autotools install systemd services to correct ... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10857 ) Change subject: osmo-build-dep.sh: Let autotools install systemd services to correct path ...................................................................... osmo-build-dep.sh: Let autotools install systemd services to correct path Change-Id: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c --- M scripts/osmo-build-dep.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 35cb373..dfec9be 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -49,7 +49,7 @@ mkdir -p "$inst/stow" autoreconf --install --force -./configure --prefix="$inst/stow/$project" $cfg +./configure --prefix="$inst/stow/$project" --with-systemdsystemunitdir="$inst/stow/$project/lib/systemd/system" $cfg $MAKE $PARALLEL_MAKE install # Make the dependencies available through symlinks in $deps ($PWD/..). -- To view, visit https://gerrit.osmocom.org/10857 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: I9eba05995fc53b72b04a4a9d63ebd5a236304f7c Gerrit-Change-Number: 10857 Gerrit-PatchSet: 2 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 Mon Sep 10 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Sep 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_#242?= Message-ID: <798290886.47.1536592206587.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_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_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_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_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_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 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 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_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 Mon Sep 10 15:16:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:16:56 +0000 Subject: Change in libosmo-sccp[master]: Revert "Revert "Install systemd services with autotools"" 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/10858 to look at the new patch set (#2). Change subject: Revert "Revert "Install systemd services with autotools"" ...................................................................... Revert "Revert "Install systemd services with autotools"" This reverts commit c8143eccc2841781af2f09f31222fcc634114bd5 and hence re-adds ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59. The commit is fine, we just need to add some extra configure flags in osmo-ci.git. Depends: https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/ Change-Id: Ifc11d97c0c5fe1f7872b59147b1548b56951921b --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/58/10858/2 -- To view, visit https://gerrit.osmocom.org/10858 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: Ifc11d97c0c5fe1f7872b59147b1548b56951921b Gerrit-Change-Number: 10858 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 gerrit-no-reply at lists.osmocom.org Mon Sep 10 15:16:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:16:56 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Remove duplicated override_dh_auto_test section In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10859 to look at the new patch set (#2). Change subject: debian/rules: Remove duplicated override_dh_auto_test section ...................................................................... debian/rules: Remove duplicated override_dh_auto_test section Change-Id: Iaf3a7448d10832cc27afa04fe482da31d7582660 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/10859/2 -- To view, visit https://gerrit.osmocom.org/10859 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: Iaf3a7448d10832cc27afa04fe482da31d7582660 Gerrit-Change-Number: 10859 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 15:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:19:48 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools 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/10858 to look at the new patch set (#3). Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools This commit re-adds ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59, plus fixes two typos (sytemd->systemd) in that commit. The commit is fine, we just need to add some extra configure flags in osmo-ci.git. Depends: https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/ Change-Id: Ifc11d97c0c5fe1f7872b59147b1548b56951921b --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/58/10858/3 -- To view, visit https://gerrit.osmocom.org/10858 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: Ifc11d97c0c5fe1f7872b59147b1548b56951921b Gerrit-Change-Number: 10858 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol 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 Sep 10 15:30:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:30:57 +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 submitted this change and it was merged. ( 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. Header was moved in uhd.git c33928d2bbdd27688c3475e77fc461e7d16eba5a. Change-Id: I6299df48a5e14c54eaa07288d166c705eb9ebdbe --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 63d3dec..b7109a4 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,6 +35,9 @@ #ifndef USE_UHD_3_11 #include +#include +#else +#include #endif #define USRP_TX_AMPL 0.3 -- 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: merged Gerrit-Change-Id: I6299df48a5e14c54eaa07288d166c705eb9ebdbe Gerrit-Change-Number: 10717 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 Mon Sep 10 15:30:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:30:59 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Use available copyTo Vector API instead of memcopy In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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: merged Gerrit-Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277 Gerrit-Change-Number: 10718 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 Mon Sep 10 15:31:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:31:01 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace in several files In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( 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/sigProcLib.cpp 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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/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: merged Gerrit-Change-Id: Ibf5a69f0a3a309e87814635fd903b114fe68890c Gerrit-Change-Number: 10719 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 Mon Sep 10 15:31:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 15:31:02 +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 submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 67ccb25..17a015b 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 -1; @@ -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: merged Gerrit-Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054 Gerrit-Change-Number: 10720 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 Mon Sep 10 15:55:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 15:55:08 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/common: ignore trailing empty lines in received results 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/10866 to look at the new patch set (#2). Change subject: osmo_interact/common: ignore trailing empty lines in received results ...................................................................... osmo_interact/common: ignore trailing empty lines in received results If the VTY/CTRL output contains trailing newlines, do not cause those to trigger mismatch errors, rather drop those. Rationale: in transcript scripts, the amount of empty lines between expected results is ignored, to allow cosmetically arranging into sections. So trailing newlines are dropped, and there is no way to preserve those. Change-Id: I1930868451c5738b17e318a9807590d948210b9a --- M osmopy/osmo_interact/common.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/66/10866/2 -- To view, visit https://gerrit.osmocom.org/10866 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: I1930868451c5738b17e318a9807590d948210b9a Gerrit-Change-Number: 10866 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 Sep 10 17:31:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Sep 2018 17:31:28 +0000 Subject: Change in openbsc[master]: mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10867 Change subject: mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check ...................................................................... mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check osmux_xfrm_input_open_circuit returns 0 on success and -1 on error. Confusion comes from that function being implemented by calling osmux_batch_add_circuit which returns NULL on error. Change-Id: I98700aa1e2fab9784706bfac1a47cc84635172b7 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/67/10867/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 69124d2..8a802f5 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -456,8 +456,8 @@ LOGP(DMGCP, LOGL_ERROR, "Cannot allocate input osmux handle\n"); return -1; } - if (!osmux_xfrm_input_open_circuit(endp->osmux.in, endp->osmux.cid, - endp->cfg->osmux_dummy)) { + if (osmux_xfrm_input_open_circuit(endp->osmux.in, endp->osmux.cid, + endp->cfg->osmux_dummy) < 0) { LOGP(DMGCP, LOGL_ERROR, "Cannot open osmux circuit %u\n", endp->osmux.cid); return -1; -- To view, visit https://gerrit.osmocom.org/10867 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: I98700aa1e2fab9784706bfac1a47cc84635172b7 Gerrit-Change-Number: 10867 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 Sep 10 17:32:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Sep 2018 17:32:57 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Don't attempt to allocate CBCH sub-slots Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10868 Change subject: lchan_select: Don't attempt to allocate CBCH sub-slots ...................................................................... lchan_select: Don't attempt to allocate CBCH sub-slots In case a given channel combination contains a CBCH, it replaces the SDCCH with sub-slot 2, i.e. we cannot try to allocate the same sub-slot for SDCCH anymore. Change-Id: I13ea737e7f74bdef671540bd047af7eb604f3730 --- M src/osmo-bsc/lchan_select.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/10868/1 diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 742c7de..a72e0c4 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -29,6 +29,18 @@ #include +/* return if the given lchan represents a SDCCH sub-slot that was replaced by CBCH */ +static bool lchan_is_cbch(struct gsm_lchan *lchan) +{ + struct gsm_bts_trx_ts *ts = lchan->ts; + if (ts->pchan_is == GSM_PCHAN_CCCH_SDCCH4_CBCH && lchan->nr == 2) + return true; + else if (ts->pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH && lchan->nr == 2) + return true; + else + return false; +} + static struct gsm_lchan * _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, enum gsm_phys_chan_config as_pchan) @@ -80,7 +92,7 @@ /* TS is (going to be) in desired pchan mode. Go ahead and check for an available lchan. */ ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) { - if (lchan->fi->state == LCHAN_ST_UNUSED) { + if (!lchan_is_cbch(lchan) && lchan->fi->state == LCHAN_ST_UNUSED) { LOGPLCHANALLOC("%s ss=%d is available%s\n", gsm_ts_and_pchan_name(ts), lchan->nr, ts->pchan_is != as_pchan ? " after dyn PCHAN change" : ""); -- To view, visit https://gerrit.osmocom.org/10868 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: I13ea737e7f74bdef671540bd047af7eb604f3730 Gerrit-Change-Number: 10868 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Sep 10 19:57:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:57:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b96cc99b6bd9_64cf5fe68c13198d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 135s] No package 'libpcsclite' found [ 135s] simtrace2-remsim.o: In function `main': [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 135s] apdu_dispatch.o: In function `apdu_segment_in': [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 135s] collect2: error: ld returned 1 exit status [ 135s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 135s] make[2]: *** [simtrace2-remsim] Error 1 [ 135s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 135s] Makefile:20: recipe for target 'utils' failed [ 135s] make[1]: *** [utils] Error 2 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] dh_auto_build: make -j1 returned exit code 2 [ 135s] debian/rules:4: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:46 UTC 2018. [ 135s] [ 135s] ### VM INTERACTION START ### [ 138s] [ 127.880679] sysrq: SysRq : Power Off [ 138s] [ 127.887788] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:50 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:56:44 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:56:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b96cc9931cc2_64cf5fe68c131733@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 134s] No package 'libpcsclite' found [ 134s] simtrace2-remsim.o: In function `main': [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 134s] apdu_dispatch.o: In function `apdu_segment_in': [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 134s] collect2: error: ld returned 1 exit status [ 134s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 134s] make[2]: *** [simtrace2-remsim] Error 1 [ 134s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 134s] Makefile:20: recipe for target 'utils' failed [ 134s] make[1]: *** [utils] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] dh_auto_build: make -j1 returned exit code 2 [ 134s] debian/rules:4: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:35 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 125.233250] sysrq: SysRq : Power Off [ 137s] [ 125.240552] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:39 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:57:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:57:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b96cc9978605_64cf5fe68c1318d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:43 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 129.773974] sysrq: SysRq : Power Off [ 139s] [ 129.780805] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:47 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:56:44 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:56:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b96cc98e9b32_64cf5fe68c131610@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 137s] No package 'libpcsclite' found [ 137s] simtrace2-remsim.o: In function `main': [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 137s] apdu_dispatch.o: In function `apdu_segment_in': [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 137s] collect2: error: ld returned 1 exit status [ 137s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 137s] make[2]: *** [simtrace2-remsim] Error 1 [ 137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 137s] Makefile:20: recipe for target 'utils' failed [ 137s] make[1]: *** [utils] Error 2 [ 137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 137s] dh_auto_build: make -j1 returned exit code 2 [ 137s] debian/rules:4: recipe for target 'build' failed [ 137s] make: *** [build] Error 2 [ 137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 137s] [ 137s] lamb61 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:33 UTC 2018. [ 137s] [ 137s] ### VM INTERACTION START ### [ 140s] [ 129.856804] sysrq: SysRq : Power Off [ 140s] [ 129.865094] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb61 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:37 UTC 2018. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:56:44 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:56:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b96cc98b4f31_64cf5fe68c13158a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 135s] No package 'libpcsclite' found [ 135s] simtrace2-remsim.o: In function `main': [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 135s] apdu_dispatch.o: In function `apdu_segment_in': [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 135s] collect2: error: ld returned 1 exit status [ 135s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 135s] make[2]: *** [simtrace2-remsim] Error 1 [ 135s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 135s] Makefile:20: recipe for target 'utils' failed [ 135s] make[1]: *** [utils] Error 2 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] dh_auto_build: make -j1 returned exit code 2 [ 135s] debian/rules:4: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] lamb25 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:32 UTC 2018. [ 135s] [ 135s] ### VM INTERACTION START ### [ 138s] [ 128.163030] sysrq: SysRq : Power Off [ 138s] [ 128.170986] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb25 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:36 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:57:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:57:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b96cc99ec7f8_64cf5fe68c132059@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 141s] No package 'libpcsclite' found [ 141s] simtrace2-remsim.o: In function `main': [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 141s] apdu_dispatch.o: In function `apdu_segment_in': [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 141s] collect2: error: ld returned 1 exit status [ 141s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 141s] make[2]: *** [simtrace2-remsim] Error 1 [ 141s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 141s] Makefile:20: recipe for target 'utils' failed [ 141s] make[1]: *** [utils] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] dh_auto_build: make -j1 returned exit code 2 [ 141s] debian/rules:4: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 141s] [ 141s] lamb74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:46 UTC 2018. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 132.393080] sysrq: SysRq : Power Off [ 144s] [ 132.400787] reboot: Power down [ 144s] ### VM INTERACTION END ### [ 144s] [ 144s] lamb74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:56:50 UTC 2018. [ 144s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:58:10 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:58:10 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b96ccefc5401_64cf5fe68c132130@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 158s] No package 'libpcsclite' found [ 158s] simtrace2-remsim.o: In function `main': [ 158s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 158s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 158s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 158s] apdu_dispatch.o: In function `apdu_segment_in': [ 158s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 158s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 158s] collect2: error: ld returned 1 exit status [ 158s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 158s] make[2]: *** [simtrace2-remsim] Error 1 [ 158s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 158s] Makefile:20: recipe for target 'utils' failed [ 158s] make[1]: *** [utils] Error 2 [ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 158s] dh_auto_build: make -j1 returned exit code 2 [ 158s] debian/rules:4: recipe for target 'build' failed [ 158s] make: *** [build] Error 2 [ 158s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 158s] [ 158s] lamb20 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:57:51 UTC 2018. [ 158s] [ 158s] ### VM INTERACTION START ### [ 162s] [ 151.384386] sysrq: SysRq : Power Off [ 162s] [ 151.391439] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] lamb20 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:57:55 UTC 2018. [ 162s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 19:58:10 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 19:58:10 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b96ccf013b22_64cf5fe68c1322d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 161s] No package 'libpcsclite' found [ 161s] simtrace2-remsim.o: In function `main': [ 161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 161s] apdu_dispatch.o: In function `apdu_segment_in': [ 161s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 161s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 161s] collect2: error: ld returned 1 exit status [ 161s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 161s] make[2]: *** [simtrace2-remsim] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 161s] Makefile:20: recipe for target 'utils' failed [ 161s] make[1]: *** [utils] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: make -j1 returned exit code 2 [ 161s] debian/rules:4: recipe for target 'build' failed [ 161s] make: *** [build] Error 2 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] [ 161s] lamb60 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:58:00 UTC 2018. [ 161s] [ 161s] ### VM INTERACTION START ### [ 165s] [ 153.479398] sysrq: SysRq : Power Off [ 165s] [ 153.486775] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb60 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 19:58:04 UTC 2018. [ 165s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 10 20:23:18 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 10 Sep 2018 20:23:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b96d2cfbe2c6_64cf5fe68c1559a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 242s] No package 'libpcsclite' found [ 242s] simtrace2-remsim.o: In function `main': [ 242s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 242s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 242s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 242s] apdu_dispatch.o: In function `apdu_segment_in': [ 242s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 242s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 242s] collect2: error: ld returned 1 exit status [ 242s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 242s] make[2]: *** [simtrace2-remsim] Error 1 [ 242s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 242s] Makefile:20: recipe for target 'utils' failed [ 242s] make[1]: *** [utils] Error 2 [ 242s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 242s] dh_auto_build: make -j1 returned exit code 2 [ 242s] debian/rules:4: recipe for target 'build' failed [ 242s] make: *** [build] Error 2 [ 242s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 242s] [ 242s] armbuild22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 20:23:11 UTC 2018. [ 242s] [ 242s] ### VM INTERACTION START ### [ 245s] [ 233.342880] SysRq : Power Off [ 245s] [ 233.361452] reboot: Power down [ 246s] ### VM INTERACTION END ### [ 246s] [ 246s] armbuild22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 10 20:23:15 UTC 2018. [ 246s] -- 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 Sep 10 22:30:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 22:30:12 +0000 Subject: Change in osmo-bts[master]: fix RSL Chan Mode Modif for dyn TS In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#5) to the change originally created by Keith Whyte. ( https://gerrit.osmocom.org/10864 ) Change subject: fix RSL Chan Mode Modif for dyn TS ...................................................................... fix RSL Chan Mode Modif for dyn TS Fix the chan mode checking for RSL Chan Mode Modif: do not reject all modes on dyn TS. In rsl_rx_mode_modif(), bts_supports_cm() should never be fed with dynamic pchan kinds (e.g. GSM_PCHAN_TCH_F_TCH_H_PDCH). Feed instead the return value of ts_pchan() that is to say, the actual pchan type (e.g. GSM_PCHAN_TCH_F). Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10864/5 -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte 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 Sep 10 22:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 22:30:13 +0000 Subject: Change in osmo-bts[master]: log: add error log for RSL Chan Mode Modif Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10869 Change subject: log: add error log for RSL Chan Mode Modif ...................................................................... log: add error log for RSL Chan Mode Modif Add log context to chan_mode error in rsl_rx_mode_modif(). Tweaked-by: neels Change-Id: I945cf1ca8660ad5daf097edab1833bbc74b6185f --- M src/common/rsl.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/69/10869/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index ad2d4de..2aa7f4d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1499,7 +1499,10 @@ lchan_tchmode_from_cmode(lchan, cm); if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) { - LOGP(DRSL, LOGL_ERROR, "invalid mode/codec instructed by BSC, check BSC configuration.\n"); + LOGP(DRSL, LOGL_ERROR, + "%s %s: invalid mode: %s (wrong BSC configuration?)\n", + gsm_ts_and_pchan_name(lchan->ts), gsm_lchan_name(lchan), + gsm48_chan_mode_name(lchan->tch_mode)); return rsl_tx_mode_modif_nack(lchan, RSL_ERR_SERV_OPT_UNAVAIL); } -- To view, visit https://gerrit.osmocom.org/10869 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: I945cf1ca8660ad5daf097edab1833bbc74b6185f Gerrit-Change-Number: 10869 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 22:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 22:30:13 +0000 Subject: Change in osmo-bts[master]: fix handling of odd pchans in bts_supports_cm() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10870 Change subject: fix handling of odd pchans in bts_supports_cm() ...................................................................... fix handling of odd pchans in bts_supports_cm() Convert the if-cascade to a switch(). For any unexpected pchan kind, reject the chan mode immediately instead of going on to invoke gsm_bts_has_feature on feature = _NUM_BTS_FEAT, and log the error. Tweaked-by: neels Change-Id: Ieaded9258554b15fcc4b7f05d5a8847175b7962f --- M src/common/bts.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/70/10870/1 diff --git a/src/common/bts.c b/src/common/bts.c index bec611c..c251fdd 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -704,7 +704,8 @@ /* Before the requested pchan/cm combination can be checked, we need to * convert it to a feature identifier we can check */ - if (pchan == GSM_PCHAN_TCH_F) { + switch (pchan) { + case GSM_PCHAN_TCH_F: switch(cm) { case GSM48_CMODE_SPEECH_V1: feature = BTS_FEAT_SPEECH_F_V1; @@ -719,7 +720,9 @@ /* Invalid speech codec type => Not supported! */ return 0; } - } else if (pchan == GSM_PCHAN_TCH_H) { + break; + + case GSM_PCHAN_TCH_H: switch(cm) { case GSM48_CMODE_SPEECH_V1: feature = BTS_FEAT_SPEECH_H_V1; @@ -731,6 +734,12 @@ /* Invalid speech codec type => Not supported! */ return 0; } + break; + + default: + LOGP(DRSL, LOGL_ERROR, "BTS %u: unhandled pchan %s when checking mode %s\n", + bts->nr, gsm_pchan_name(pchan), gsm48_chan_mode_name(cm)); + return 0; } /* Check if the feature is supported by this BTS */ -- To view, visit https://gerrit.osmocom.org/10870 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: Ieaded9258554b15fcc4b7f05d5a8847175b7962f Gerrit-Change-Number: 10870 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 22:31:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 22:31:53 +0000 Subject: Change in osmo-bts[master]: fix RSL Chan Mode Modif for dyn TS In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10864 ) Change subject: fix RSL Chan Mode Modif for dyn TS ...................................................................... Patch Set 5: I split off the logging changes into separate patches, and since this is now identical to my initial patch, changed the author of this one to me. -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 10 Sep 2018 22:31:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 10 23:54:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Sep 2018 23:54:36 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10871 Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... ts,lchan_fsm: do not attempt to allocate CBCH subslots In case a given channel combination contains a CBCH, it replaces sub-slot 2 with a CBCH, i.e. we must not attempt to allocate the same for SDCCH. On timeslot initialization, immediately place such an lchan FSM into new state LCHAN_ST_CBCH, so that it never appears unused and never is picked during lchan_select(). Verified by configuring CBCH timeslots and watching 'show lchan summary'. Immediately after RSL and OML are up, these pchan types show lchan 2 in state CBCH: BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type NONE, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type NONE, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm With a 'phys_chan_config ccch+sdcch4+cbch' and three phones simultaneously requesting USSD, I see: BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 0, Type SDCCH, State ESTABLISHED - L1 MS Power: 14 dBm RXL-FULL-dl: -53 dBm RXL-FULL-ul: -47 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 1, Type SDCCH, State ESTABLISHED - L1 MS Power: 30 dBm RXL-FULL-dl: -47 dBm RXL-FULL-ul: -47 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type NONE, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 3, Type SDCCH, State ESTABLISHED - L1 MS Power: 16 dBm RXL-FULL-dl: -47 dBm RXL-FULL-ul: -47 dBm With 'phys_chan_config SDCCH8+CBCH' and three phones simultaneously attaching, I see: BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 0, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 1, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type NONE, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 3, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 4, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 5, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 6, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 7, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm i.e. in all cases the CBCH lchan remains occupied and is not allocated as SDCCH. Detaching and re-attaching the BTS reliably brings back the CBCH state. Also verified that changing the osmo-bsc config from telnet vty and dropping oml followed by the BTS re-attaching brings back the CBCH state. Change-Id: I2bafc5f696e818e38f8907ad0c8f38494df0623d --- M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/10871/1 diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index 35b8847..9fbf9b3 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -14,6 +14,7 @@ enum lchan_fsm_state { LCHAN_ST_UNUSED, + LCHAN_ST_CBCH, /*< Blocked by CBCH channel combination, not usable as SDCCH. */ LCHAN_ST_WAIT_TS_READY, LCHAN_ST_WAIT_ACTIV_ACK, /*< After RSL Chan Act Ack, lchan is active but RTP not configured. */ LCHAN_ST_WAIT_RLL_RTP_ESTABLISH, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 1ef7869..c80d8a1 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1035,6 +1035,13 @@ , .out_state_mask = 0 | S(LCHAN_ST_WAIT_TS_READY) + | S(LCHAN_ST_CBCH) + , + }, + [LCHAN_ST_CBCH] = { + .name = "CBCH", + .out_state_mask = 0 + | S(LCHAN_ST_UNUSED) , }, [LCHAN_ST_WAIT_TS_READY] = { diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 56b3357..865976e 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -295,6 +295,14 @@ T_CHAN_ACT_DEACT); break; + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* For any pchans containing a CBCH, lchan[2] is reserved for CBCH and cannot be + * allocated for SDCCH. */ + OSMO_ASSERT(ts->lchan[2].fi); + osmo_fsm_inst_state_chg(ts->lchan[2].fi, LCHAN_ST_CBCH, 0, 0); + break; + default: /* nothing to do */ break; -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Sep 11 00:05:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 11 Sep 2018 00:05:48 +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_#5468?= Message-ID: <880673459.49.1536624348042.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 294.06 KB...] =============================== libosmo-sccp =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmo-sccp + project=libosmo-sccp + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-sccp + cd libosmo-sccp + git fetch --tags origin >From git://git.osmocom.org/libosmo-sccp ba3da6d..5a266f6 pespin/systemd -> origin/pespin/systemd + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at c8143ec... Revert "Install systemd services with autotools" + git rev-parse HEAD c8143eccc2841781af2f09f31222fcc634114bd5 + cd libosmo-sccp + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. 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' examples/Makefile.am: installing './depcomp' tests/sccp/Makefile.am:8: warning: source file '$(top_srcdir)/src/sccp.c' is in a subdirectory, tests/sccp/Makefile.am:8: 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. + ./configure --prefix=/build/deps/install/stow/libosmo-sccp --with-systemdsystemunitdir=/build/deps/install/stow/libosmo-sccp/lib/systemd/system configure: WARNING: unrecognized options: --with-systemdsystemunitdir 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 LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMONETIF... yes checking for library containing sctp_send... -lsctp checking if gcc supports -fvisibility=hidden... yes checking for doxygen... /usr/bin/doxygen CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-sigtran.pc config.status: creating libosmo-sccp.pc config.status: creating libosmo-mtp.pc config.status: creating libosmo-xua.pc config.status: creating include/sccp/Makefile config.status: creating include/mtp/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/sigtran/Makefile config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating tests/sccp/Makefile config.status: creating tests/mtp/Makefile config.status: creating tests/m2ua/Makefile config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.10.0.7-c814 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/sccp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Entering directory '/build/deps/libosmo-sccp/include/mtp' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/mtp' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/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/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' 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/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC mtp_pcap.o CC sccp.o CC libxua_a-xua_msg.o CC sua.lo CC sccp_sap.lo CC m3ua.lo CC xua_msg.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo gcc: internal compiler error: Segmentation fault (program as) Please submit a full bug report, with preprocessed source if appropriate. See for instructions. Makefile:557: recipe for target 'libxua_a-xua_msg.o' failed make[2]: *** [libxua_a-xua_msg.o] Error 4 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Makefile:473: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 Makefile:772: 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 Tue Sep 11 00:09:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 11 Sep 2018 00:09:24 +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_#5469?= In-Reply-To: <880673459.49.1536624348042.JavaMail.jenkins@jenkins.osmocom.org> References: <880673459.49.1536624348042.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <107165056.50.1536624564093.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Sep 11 00:15:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:15:33 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10871 to look at the new patch set (#2). Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... ts,lchan_fsm: do not attempt to allocate CBCH subslots In case a given channel combination contains a CBCH, it replaces sub-slot 2 with a CBCH, i.e. we must not attempt to allocate the same for SDCCH. On timeslot initialization, immediately place such an lchan FSM into new state LCHAN_ST_CBCH, so that it never appears unused and never is picked during lchan_select(). Also set lchan->type = GSM_LCHAN_CBCH. Verified by configuring CBCH timeslots and watching 'show lchan summary'. Immediately after RSL and OML are up, these pchan types show lchan 2 in state CBCH: BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm With a 'phys_chan_config ccch+sdcch4+cbch' and three phones simultaneously requesting USSD, I see: BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 0, Type SDCCH, State ESTABLISHED - L1 MS Power: 14 dBm RXL-FULL-dl: -53 dBm RXL-FULL-ul: -47 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 1, Type SDCCH, State ESTABLISHED - L1 MS Power: 30 dBm RXL-FULL-dl: -47 dBm RXL-FULL-ul: -47 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 3, Type SDCCH, State ESTABLISHED - L1 MS Power: 16 dBm RXL-FULL-dl: -47 dBm RXL-FULL-ul: -47 dBm With 'phys_chan_config SDCCH8+CBCH' and three phones simultaneously attaching, I see: BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 0, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 1, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 3, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm i.e. in all cases the CBCH lchan remains occupied and is not allocated as SDCCH. Detaching and re-attaching the BTS reliably brings back the CBCH state. Also verified that changing the osmo-bsc config from telnet vty and dropping oml followed by the BTS re-attaching brings back the CBCH state. Change-Id: I2bafc5f696e818e38f8907ad0c8f38494df0623d --- M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/10871/2 -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 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 Sep 11 00:17:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:17:47 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... Patch Set 2: (1 comment) updated to also show type = CBCH. BTW, I'm a bit confused, with CCCH+SDCCH4+CBCH and an SDCCH8, I see only three SDCCH allocated when three phones attach. But with CCCH and SDCCH8+CBCH, it seems that this number is doubled to six SDCCH. Not sure if that is some error... ignoring it for now. https://gerrit.osmocom.org/#/c/10871/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10871/1//COMMIT_MSG at 22 PS1, Line 22: BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm maybe the type should also show as CBCH instead of NONE? How does it work, does the CBCH need Chan Activ between BTS<->BSC, or is it implicit by the BTS? -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 00:17:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 00:27:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:27:42 +0000 Subject: Change in docker-playground[master]: WIP: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: WIP: debian-repo-install-test: new binary package test ...................................................................... Patch Set 2: btw, you can also mark a patch as Work In Progress by clicking that button here in the gerrit UI. To remove it again, click "Start Review". -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 00:27:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 00:40:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:40:20 +0000 Subject: Change in docker-playground[master]: WIP: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: WIP: debian-repo-install-test: new binary package test ...................................................................... Patch Set 2: Code-Review+2 (2 comments) since this is a new subdir and nothing depends on it, you can decide whether to commit this patch as-is and continue later, or to wait and add more changes before submitting. https://gerrit.osmocom.org/#/c/10862/2/debian-repo-install-test/testdata/repo-install-test.sh File debian-repo-install-test/testdata/repo-install-test.sh: https://gerrit.osmocom.org/#/c/10862/2/debian-repo-install-test/testdata/repo-install-test.sh at 1 PS2, Line 1: #!/bin/sh -e also add -x to list the commands that were run? https://gerrit.osmocom.org/#/c/10862/2/debian-repo-install-test/testdata/repo-install-test.sh at 44 PS2, Line 44: bash what does this do? if it's an interactive shell, just exiting should already give a terminal? I'm confused... -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 00:40:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 00:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:41:08 +0000 Subject: Change in osmo-mgw[master]: log: avoid logging early media as error In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10861 ) Change subject: log: avoid logging early media as error ...................................................................... log: avoid logging early media as error When the peer address is still 0.0.0.0, the endpoint is not yet configured. This commonly happens before bridging a call is complete, so instead of ERROR logging about an invalid packet, rather INFO-log this as "early media". Related: OS#3539 Change-Id: I335f6453bd599be76eef08fcf9e5daed071e5b6d --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 26 insertions(+), 13 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 a73209b..d769ef3 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -874,19 +874,32 @@ 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; + if (memcmp(&zero_addr, &conn->end.addr, sizeof(zero_addr)) == 0) { + switch (conn->conn->mode) { + case 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; + + default: + /* Receiving early media before the endpoint is configured. Instead of logging + * this as an error that occurs on every call, keep it more low profile to not + * confuse humans with expected errors. */ + LOGP(DRTP, LOGL_INFO, + "endpoint:0x%x I:%s Rx RTP from %s, but remote address not set:" + " dropping early media\n", + ENDPOINT_NUMBER(endp), conn->conn->id, inet_ntoa(addr->sin_addr)); + return -1; + } } /* Note: Check if the inbound RTP data comes from the same host to -- To view, visit https://gerrit.osmocom.org/10861 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: I335f6453bd599be76eef08fcf9e5daed071e5b6d Gerrit-Change-Number: 10861 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 Sep 11 00:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:41:28 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/vty.py: fix parsing of vty logging In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10865 ) Change subject: osmo_interact/vty.py: fix parsing of vty logging ...................................................................... osmo_interact/vty.py: fix parsing of vty logging Because the VTY logging target currently prints '\n\r' instead of '\r\n', the python splitlines() separates those as interleaving empty lines. Ignore '\r' to allow verifying VTY logging output as well. Change-Id: I8de9cebaa9aad275f65c3672985b7cbca343b5a6 --- M osmopy/osmo_interact/vty.py 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmopy/osmo_interact/vty.py b/osmopy/osmo_interact/vty.py index 4704c09..e66ed22 100755 --- a/osmopy/osmo_interact/vty.py +++ b/osmopy/osmo_interact/vty.py @@ -110,7 +110,13 @@ last_line = "%s%s" % (last_line, new_data) if last_line: - lines = last_line.splitlines() + # Separate the received response into lines. + # But note: the VTY logging currently separates with '\n\r', not '\r\n', + # see _vty_output() in libosmocore logging_vty.c. + # So we need to jump through hoops to not separate 'abc\n\rdef' as + # [ 'abc', '', 'def' ]; but also not to convert '\r\n\r\n' to '\r\n\n' ('\r{\r\n}\n') + # Simplest is to just drop all the '\r' and only care about the '\n'. + lines = last_line.replace('\r', '').splitlines() received_lines.extend(lines[:-1]) last_line = lines[-1] -- To view, visit https://gerrit.osmocom.org/10865 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: I8de9cebaa9aad275f65c3672985b7cbca343b5a6 Gerrit-Change-Number: 10865 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 Sep 11 00:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:41:45 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/common: ignore trailing empty lines in received results In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10866 ) Change subject: osmo_interact/common: ignore trailing empty lines in received results ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10866 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: I1930868451c5738b17e318a9807590d948210b9a Gerrit-Change-Number: 10866 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 00: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 Tue Sep 11 00:41:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 00:41:47 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_interact/common: ignore trailing empty lines in received results In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10866 ) Change subject: osmo_interact/common: ignore trailing empty lines in received results ...................................................................... osmo_interact/common: ignore trailing empty lines in received results If the VTY/CTRL output contains trailing newlines, do not cause those to trigger mismatch errors, rather drop those. Rationale: in transcript scripts, the amount of empty lines between expected results is ignored, to allow cosmetically arranging into sections. So trailing newlines are dropped, and there is no way to preserve those. Change-Id: I1930868451c5738b17e318a9807590d948210b9a --- M osmopy/osmo_interact/common.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index 31f44a8..39163a2 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -175,6 +175,10 @@ step.verify_interact_state(self) res = self.command(step.command) + # trailing empty lines in the command output cannot be preserved because we allow + # arbitrary newlines between commands. Do not even track these. + while res and not res[-1]: + res = res[:-1] if self.verbose: sys.stderr.flush() -- To view, visit https://gerrit.osmocom.org/10866 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: I1930868451c5738b17e318a9807590d948210b9a Gerrit-Change-Number: 10866 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 Sep 11 03:15:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:15:40 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10871/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10871/1//COMMIT_MSG at 22 PS1, Line 22: BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type NONE, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm > maybe the type should also show as CBCH instead of NONE? How does it work, does the CBCH need Chan A [?] yes, it would make sense to show as "Type CBCH". Activation is (like all common/broadcast channels such as BCCH, PCH, AGCH) implicit. Only dedicated channels are explicitly activated. -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 11 Sep 2018 03:15:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:15:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:15:56 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 03:15: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 Sep 11 03:16:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:16:40 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... Patch Set 2: Commitlog should contain "Closes: OS#3546" -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 03:16:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:17:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:17:02 +0000 Subject: Change in osmo-bsc[master]: lchan_select: Don't attempt to allocate CBCH sub-slots In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/10868 ) Change subject: lchan_select: Don't attempt to allocate CBCH sub-slots ...................................................................... Abandoned Superseded by https://gerrit.osmocom.org/#/c/osmo-bsc/+/10871/2 -- To view, visit https://gerrit.osmocom.org/10868 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: I13ea737e7f74bdef671540bd047af7eb604f3730 Gerrit-Change-Number: 10868 Gerrit-PatchSet: 2 Gerrit-Owner: 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 Sep 11 03:18:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:18:47 +0000 Subject: Change in osmo-bts[master]: fix RSL Chan Mode Modif for dyn TS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10864 ) Change subject: fix RSL Chan Mode Modif for dyn TS ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 03:18:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:19:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:19:03 +0000 Subject: Change in osmo-bts[master]: log: add error log for RSL Chan Mode Modif In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10869 ) Change subject: log: add error log for RSL Chan Mode Modif ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10869 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: I945cf1ca8660ad5daf097edab1833bbc74b6185f Gerrit-Change-Number: 10869 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Tue, 11 Sep 2018 03:19: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 Sep 11 03:20:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:20:05 +0000 Subject: Change in osmo-bts[master]: fix handling of odd pchans in bts_supports_cm() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10870 ) Change subject: fix handling of odd pchans in bts_supports_cm() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10870 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: Ieaded9258554b15fcc4b7f05d5a8847175b7962f Gerrit-Change-Number: 10870 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Tue, 11 Sep 2018 03: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 Tue Sep 11 03:20:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:20:32 +0000 Subject: Change in osmo-mgw[master]: debian: Remove dangling symlink to osmo-bsc-mgcp.service In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10860 ) Change subject: debian: Remove dangling symlink to osmo-bsc-mgcp.service ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10860 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: Ifdcb266efd821eac9d90aff186400f85751e8f42 Gerrit-Change-Number: 10860 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Sep 2018 03:20: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 Sep 11 03:20:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:20:34 +0000 Subject: Change in osmo-mgw[master]: debian: Remove dangling symlink to osmo-bsc-mgcp.service In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10860 ) Change subject: debian: Remove dangling symlink to osmo-bsc-mgcp.service ...................................................................... debian: Remove dangling symlink to osmo-bsc-mgcp.service osmo-bsc-mgcp was removed recently from osmo-mgw.git as it belongs to openbsc.git. This symlink was a leftover from that time. Change-Id: Ifdcb266efd821eac9d90aff186400f85751e8f42 --- D debian/osmo-bsc-mgcp.service 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service deleted file mode 120000 index eb73b7b..0000000 --- a/debian/osmo-bsc-mgcp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10860 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: Ifdcb266efd821eac9d90aff186400f85751e8f42 Gerrit-Change-Number: 10860 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 Tue Sep 11 03:20:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:20:59 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Remove duplicated override_dh_auto_test section In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10859 ) Change subject: debian/rules: Remove duplicated override_dh_auto_test section ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10859 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: Iaf3a7448d10832cc27afa04fe482da31d7582660 Gerrit-Change-Number: 10859 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Sep 2018 03:20: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 Sep 11 03:21:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:21:53 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10858 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10858 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: Ifc11d97c0c5fe1f7872b59147b1548b56951921b Gerrit-Change-Number: 10858 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 03:21:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:21:55 +0000 Subject: Change in libosmo-sccp[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10858 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools This commit re-adds ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59, plus fixes two typos (sytemd->systemd) in that commit. The commit is fine, we just need to add some extra configure flags in osmo-ci.git. Depends: https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/ Change-Id: Ifc11d97c0c5fe1f7872b59147b1548b56951921b --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-stp.install D debian/osmo-stp.service M debian/rules 7 files changed, 29 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 3f4de13..7d09259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,16 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc +SUBDIRS = include src tests examples stp doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index c0cc488..af64bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,21 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -122,5 +137,7 @@ stp/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..e7d846f --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-stp.service +systemdsystemunit_DATA = \ + osmo-stp.service +endif diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index b2f8077..839735c 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,2 +1,3 @@ +/lib/systemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service deleted file mode 120000 index 55f37c2..0000000 --- a/debian/osmo-stp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-stp.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index bea0a76..ec5c21c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static + dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/systemd/system # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/10858 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: Ifc11d97c0c5fe1f7872b59147b1548b56951921b Gerrit-Change-Number: 10858 Gerrit-PatchSet: 3 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 Tue Sep 11 03:22:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:22:00 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Remove duplicated override_dh_auto_test section In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10859 ) Change subject: debian/rules: Remove duplicated override_dh_auto_test section ...................................................................... debian/rules: Remove duplicated override_dh_auto_test section Change-Id: Iaf3a7448d10832cc27afa04fe482da31d7582660 --- 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 ec5c21c..6e69d24 100755 --- a/debian/rules +++ b/debian/rules @@ -19,10 +19,6 @@ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install -# Print test results in case of a failure -override_dh_auto_test: - dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) - override_dh_auto_configure: dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10859 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: Iaf3a7448d10832cc27afa04fe482da31d7582660 Gerrit-Change-Number: 10859 Gerrit-PatchSet: 3 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 Tue Sep 11 03:22:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:22:33 +0000 Subject: Change in openbsc[master]: mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10867 ) Change subject: mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10867 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: I98700aa1e2fab9784706bfac1a47cc84635172b7 Gerrit-Change-Number: 10867 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Sep 2018 03:22: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 Sep 11 03:22:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:22:35 +0000 Subject: Change in openbsc[master]: mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10867 ) Change subject: mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check ...................................................................... mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check osmux_xfrm_input_open_circuit returns 0 on success and -1 on error. Confusion comes from that function being implemented by calling osmux_batch_add_circuit which returns NULL on error. Change-Id: I98700aa1e2fab9784706bfac1a47cc84635172b7 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 69124d2..8a802f5 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -456,8 +456,8 @@ LOGP(DMGCP, LOGL_ERROR, "Cannot allocate input osmux handle\n"); return -1; } - if (!osmux_xfrm_input_open_circuit(endp->osmux.in, endp->osmux.cid, - endp->cfg->osmux_dummy)) { + if (osmux_xfrm_input_open_circuit(endp->osmux.in, endp->osmux.cid, + endp->cfg->osmux_dummy) < 0) { LOGP(DMGCP, LOGL_ERROR, "Cannot open osmux circuit %u\n", endp->osmux.cid); return -1; -- To view, visit https://gerrit.osmocom.org/10867 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: I98700aa1e2fab9784706bfac1a47cc84635172b7 Gerrit-Change-Number: 10867 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 Tue Sep 11 03:23:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:23:14 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane way for 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 way for non-trivially copyable types ...................................................................... Patch Set 3: Code-Review+2 -- 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: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 03:23:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:23:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:23:36 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane way for non-trivially copyable types In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10721 ) Change subject: Vector: Copy arrays in a sane way for non-trivially copyable types ...................................................................... Vector: Copy arrays in a sane way for 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 51a9fb1..9119683 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..fc8157e 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: merged Gerrit-Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c Gerrit-Change-Number: 10721 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:23:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:23:36 +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 submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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: merged Gerrit-Change-Id: I7effaf243fd6e7fe69728cfce5f97e0b5bd4743c Gerrit-Change-Number: 10722 Gerrit-PatchSet: 3 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 Tue Sep 11 03:24:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:24:47 +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 3: looks like we first need to ensure LimeSuite is deployed on all of our build slaves using the ansible playbook. I hope the debian9 distro package is sufficient for compile testing -- 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: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Sep 2018 03:24: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 Sep 11 03:26:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:26:53 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI remote host (-i) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI remote host (-i) ...................................................................... Patch Set 2: > So that is a bug, then? Is it really harmful to do name resolution > once at program startup? Once at program startup is acceptable, like in the case of a command-line argument which cannot change at runtime. But it's not accceptable if we do a blocking DNS lookup at some later runtime of the program, if the user changes it via VTY. So in thaat case, we must restrict it in some way to use only IP addresses. -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Sep 2018 03:26:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:27:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:27:52 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: refactor Timing Advance handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10819 ) Change subject: trxcon/l1ctl.c: refactor Timing Advance handling ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10819 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: I0e4f18173347e3a7cb875f95d796e8ea20bfc4bf Gerrit-Change-Number: 10819 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Sep 2018 03:27:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 03:27:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Sep 2018 03:27:55 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: refactor Timing Advance handling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10819 ) Change subject: trxcon/l1ctl.c: refactor Timing Advance handling ...................................................................... trxcon/l1ctl.c: refactor Timing Advance handling Change-Id: I0e4f18173347e3a7cb875f95d796e8ea20bfc4bf --- M src/host/trxcon/l1ctl.c M src/host/trxcon/trx_if.c 2 files changed, 6 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 230ef0a..1e88f8b 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -663,7 +663,6 @@ { struct l1ctl_par_req *par_req; struct l1ctl_info_ul *ul; - int rc = 0; ul = (struct l1ctl_info_ul *) msg->l1h; par_req = (struct l1ctl_par_req *) ul->payload; @@ -671,13 +670,16 @@ LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_PARAM_REQ " "(ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); - rc |= trx_if_cmd_setta(l1l->trx, par_req->ta); + /* Instruct TRX to use new TA value */ + if (l1l->trx->ta != par_req->ta) { + trx_if_cmd_setta(l1l->trx, par_req->ta); + l1l->trx->ta = par_req->ta; + } - l1l->trx->ta = par_req->ta; l1l->trx->tx_power = par_req->tx_power; msgb_free(msg); - return rc; + return 0; } static int l1ctl_rx_tch_mode_req(struct l1ctl_link *l1l, struct msgb *msg) diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 19d8c75..b8bbace 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -388,10 +388,6 @@ int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta) { - /* Do nothing, if requested TA value matches the current */ - if (trx->ta == ta) - return 0; - return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); } -- To view, visit https://gerrit.osmocom.org/10819 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: I0e4f18173347e3a7cb875f95d796e8ea20bfc4bf Gerrit-Change-Number: 10819 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 11 07:41:49 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 07:41:49 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (2 comments) This is not just rework of the previous change, some of my changes were just thrown away without explanation. See the comments. https://gerrit.osmocom.org/#/c/10832/1/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10832/1/apps/grgsm_trx at 55 PS1, Line 55: argv _hz suffix is redundant, of course frequency is in Hz https://gerrit.osmocom.org/#/c/10832/1/apps/grgsm_trx at 71 PS1, Line 71: self.radio.freq_offset_hz = self.phy_freq_offset_hz this should be passed as parameter to radio_if, there is no reason to set it to None in any circumstances, it can safely be 0 by default -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 11 Sep 2018 07:41:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 07:42:30 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 07:42:30 +0000 Subject: Change in gr-gsm[master]: grgsm_scanner: Add --debug option In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10784 ) Change subject: grgsm_scanner: Add --debug option ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10784 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: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 Gerrit-Change-Number: 10784 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Tue, 11 Sep 2018 07:42: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 Sep 11 07:43:45 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 07:43:45 +0000 Subject: Change in gr-gsm[master]: Format the output into ostringstream and then write it at once. In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. ...................................................................... Patch Set 1: -Verified -Code-Review -- To view, visit https://gerrit.osmocom.org/10731 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: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Tue, 11 Sep 2018 07:43: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 Sep 11 07:43:52 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 07:43:52 +0000 Subject: Change in gr-gsm[master]: Format the output into ostringstream and then write it at once. In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10731 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: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Tue, 11 Sep 2018 07:43:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 07:56:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Sep 2018 07:56:15 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... Patch Set 1: > some of my changes were just thrown away without explanation The explanation is simple: both are not related to argparse itself. I prefer to have atomic changes, so if some day we will have to revert this particular commit, we wouldn't lose the changes you mentioned below. So, let's keep this change as-is, because it does exactly what is stated in the commit message. While renaming variables and changing class definitions for sure can (and I think should) be done in separate changes ;) -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 07:56:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 08:13:23 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 08:13:23 +0000 Subject: Change in gr-gsm[master]: grgsm_scanner: Add --debug option In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10784 ) Change subject: grgsm_scanner: Add --debug option ...................................................................... grgsm_scanner: Add --debug option When set the stdout and stderr won't be redirected to /dev/null which will facilitate resolving issues Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 --- M apps/grgsm_scanner 1 file changed, 21 insertions(+), 16 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner index b57569d..32210ed 100755 --- a/apps/grgsm_scanner +++ b/apps/grgsm_scanner @@ -297,7 +297,7 @@ return "ARFCN: %4u, Freq: %6.1fM, CID: %5u, LAC: %5u, MCC: %3u, MNC: %3u, Pwr: %3i" % ( self.arfcn, self.freq / 1e6, self.cid, self.lac, self.mcc, self.mnc, self.power) -def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None): +def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug = False): signallist = [] channels_num = int(samp_rate / 0.2e6) for arfcn_range in grgsm.arfcn.get_arfcn_ranges(band): @@ -311,14 +311,15 @@ while current_freq < stop_freq: - # silence rtl_sdr output: - # open 2 fds - null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)] - # save the current file descriptors to a tuple - save = os.dup(1), os.dup(2) - # put /dev/null fds on 1 and 2 - os.dup2(null_fds[0], 1) - os.dup2(null_fds[1], 2) + if not debug: + # silence rtl_sdr output: + # open 2 fds + null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)] + # save the current file descriptors to a tuple + save = os.dup(1), os.dup(2) + # put /dev/null fds on 1 and 2 + os.dup2(null_fds[0], 1) + os.dup2(null_fds[1], 2) # instantiate scanner and processor scanner = wideband_scanner(rec_len=6 - speed, @@ -359,12 +360,14 @@ scanner = None - # restore file descriptors so we can print the results - os.dup2(save[0], 1) - os.dup2(save[1], 2) - # close the temporary fds - os.close(null_fds[0]) - os.close(null_fds[1]) + + if not debug: + # restore file descriptors so we can print the results + os.dup2(save[0], 1) + os.dup2(save[1], 2) + # close the temporary fds + os.close(null_fds[0]) + os.close(null_fds[1]) if prn: prn(found_list) signallist.extend(found_list) @@ -389,6 +392,8 @@ help="Scan speed [default=%default]. Value range 0-5.") parser.add_option("-v", "--verbose", action="store_true", help="If set, verbose information output is printed: ccch configuration, cell ARFCN's, neighbour ARFCN's") + parser.add_option("-d", "--debug", action="store_true", + help="Print additional debug messages") """ Dont forget: sudo sysctl kernel.shmmni=32000 @@ -415,7 +420,7 @@ print info.get_verbose_info() print "" do_scan(options.samp_rate, options.band, options.speed, - options.ppm, options.gain, options.args, prn = printfunc) + options.ppm, options.gain, options.args, prn = printfunc, debug = options.debug) if __name__ == '__main__': main() -- To view, visit https://gerrit.osmocom.org/10784 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: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 Gerrit-Change-Number: 10784 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 08:33:38 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 08:33:38 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... Patch Set 1: -Verified -Code-Review -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 08:33: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 Sep 11 09:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 09:12:02 +0000 Subject: Change in gr-gsm[master]: Format the output into ostringstream and then write it at once. In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( 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(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified 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 Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 09:17:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Sep 2018 09:17:21 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10862 to look at the new patch set (#3). Change subject: debian-repo-install-test: new binary package test ...................................................................... debian-repo-install-test: new binary package test Installs all packages from the Debian repository into a plain debian:stretch container. The list of packages is automatically generated with aptitude, so the job does not need to be changed for every new package. The feed ("latest", "nightly") can be specified with the FEED environment variable in the jenkins.sh (defaults to nightly). Change-Id: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Relates: OS#3176 --- A debian-repo-install-test/jenkins.sh A debian-repo-install-test/testdata/Release.key A debian-repo-install-test/testdata/repo-install-test.sh 3 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/10862/3 -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 09:39:15 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 09:39:15 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10831 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: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 09:39:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 12:03:40 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 12:03:40 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has abandoned this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 12:04:11 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Tue, 11 Sep 2018 12:04:11 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has restored this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... Restored -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: restore Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 12:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 11 Sep 2018 12:30:13 +0000 Subject: Change in osmo-bts[master]: fix RSL Chan Mode Modif for dyn TS In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10864 ) Change subject: fix RSL Chan Mode Modif for dyn TS ...................................................................... fix RSL Chan Mode Modif for dyn TS Fix the chan mode checking for RSL Chan Mode Modif: do not reject all modes on dyn TS. In rsl_rx_mode_modif(), bts_supports_cm() should never be fed with dynamic pchan kinds (e.g. GSM_PCHAN_TCH_F_TCH_H_PDCH). Feed instead the return value of ts_pchan() that is to say, the actual pchan type (e.g. GSM_PCHAN_TCH_F). Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index c6c00ea..ad2d4de 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1498,7 +1498,7 @@ cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE); lchan_tchmode_from_cmode(lchan, cm); - if (bts_supports_cm(lchan->ts->trx->bts, lchan->ts->pchan, lchan->tch_mode) != 1) { + if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) { LOGP(DRSL, LOGL_ERROR, "invalid mode/codec instructed by BSC, check BSC configuration.\n"); return rsl_tx_mode_modif_nack(lchan, RSL_ERR_SERV_OPT_UNAVAIL); } -- To view, visit https://gerrit.osmocom.org/10864 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: I7f0c835b25289931bccf96e982ea5564c8be4192 Gerrit-Change-Number: 10864 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 12:31:14 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 11 Sep 2018 12:31:14 +0000 Subject: Change in osmo-bts[master]: log: add error log for RSL Chan Mode Modif In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10869 ) Change subject: log: add error log for RSL Chan Mode Modif ...................................................................... log: add error log for RSL Chan Mode Modif Add log context to chan_mode error in rsl_rx_mode_modif(). Tweaked-by: neels Change-Id: I945cf1ca8660ad5daf097edab1833bbc74b6185f --- M src/common/rsl.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index ad2d4de..2aa7f4d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1499,7 +1499,10 @@ lchan_tchmode_from_cmode(lchan, cm); if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) { - LOGP(DRSL, LOGL_ERROR, "invalid mode/codec instructed by BSC, check BSC configuration.\n"); + LOGP(DRSL, LOGL_ERROR, + "%s %s: invalid mode: %s (wrong BSC configuration?)\n", + gsm_ts_and_pchan_name(lchan->ts), gsm_lchan_name(lchan), + gsm48_chan_mode_name(lchan->tch_mode)); return rsl_tx_mode_modif_nack(lchan, RSL_ERR_SERV_OPT_UNAVAIL); } -- To view, visit https://gerrit.osmocom.org/10869 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: I945cf1ca8660ad5daf097edab1833bbc74b6185f Gerrit-Change-Number: 10869 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr 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 Tue Sep 11 12:32:14 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 11 Sep 2018 12:32:14 +0000 Subject: Change in osmo-bts[master]: fix handling of odd pchans in bts_supports_cm() In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10870 ) Change subject: fix handling of odd pchans in bts_supports_cm() ...................................................................... fix handling of odd pchans in bts_supports_cm() Convert the if-cascade to a switch(). For any unexpected pchan kind, reject the chan mode immediately instead of going on to invoke gsm_bts_has_feature on feature = _NUM_BTS_FEAT, and log the error. Tweaked-by: neels Change-Id: Ieaded9258554b15fcc4b7f05d5a8847175b7962f --- M src/common/bts.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/bts.c b/src/common/bts.c index bec611c..c251fdd 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -704,7 +704,8 @@ /* Before the requested pchan/cm combination can be checked, we need to * convert it to a feature identifier we can check */ - if (pchan == GSM_PCHAN_TCH_F) { + switch (pchan) { + case GSM_PCHAN_TCH_F: switch(cm) { case GSM48_CMODE_SPEECH_V1: feature = BTS_FEAT_SPEECH_F_V1; @@ -719,7 +720,9 @@ /* Invalid speech codec type => Not supported! */ return 0; } - } else if (pchan == GSM_PCHAN_TCH_H) { + break; + + case GSM_PCHAN_TCH_H: switch(cm) { case GSM48_CMODE_SPEECH_V1: feature = BTS_FEAT_SPEECH_H_V1; @@ -731,6 +734,12 @@ /* Invalid speech codec type => Not supported! */ return 0; } + break; + + default: + LOGP(DRSL, LOGL_ERROR, "BTS %u: unhandled pchan %s when checking mode %s\n", + bts->nr, gsm_pchan_name(pchan), gsm48_chan_mode_name(cm)); + return 0; } /* Check if the feature is supported by this BTS */ -- To view, visit https://gerrit.osmocom.org/10870 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: Ieaded9258554b15fcc4b7f05d5a8847175b7962f Gerrit-Change-Number: 10870 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Sep 11 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 11 Sep 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_#243?= In-Reply-To: <798290886.47.1536592206587.JavaMail.jenkins@jenkins.osmocom.org> References: <798290886.47.1536592206587.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2143433111.69.1536678606427.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_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 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_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_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 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 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 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 -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_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.... 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 Sep 11 16:05:24 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 11 Sep 2018 16:05:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain AUTS 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/10767 to look at the new patch set (#5). Change subject: L3_Common: extend the AuthVector to contain AUTS ...................................................................... L3_Common: extend the AuthVector to contain AUTS AUTS is used in the UMTS AKA resync procedure. Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb --- M library/L3_Common.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/10767/5 -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 5 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 Tue Sep 11 16:31:49 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 11 Sep 2018 16:31:49 +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 15: (1 comment) https://gerrit.osmocom.org/#/c/9257/15/include/osmocom/sgsn/gprs_gmm_attach.h File include/osmocom/sgsn/gprs_gmm_attach.h: https://gerrit.osmocom.org/#/c/9257/15/include/osmocom/sgsn/gprs_gmm_attach.h at 8 PS15, Line 8: enum gmm_attach_req_fsm_states { > if those states are modelled after any spec reference, it might be useful to document it here in a c [?] I'ven't found FSM in the spec for the attach request. -- 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: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 11 Sep 2018 16:31:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 17:36:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Sep 2018 17:36:37 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10880 Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation ...................................................................... trx/radio_if.py: clarify magic numbers in sample rate calculation Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857 --- M python/trx/radio_if.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/80/10880/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 2aeb49a..f7f124f 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -75,8 +75,8 @@ GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) - # TODO: explain where do these values come from? - SAMPLE_RATE = 4.0 * 1625000.0 / 6.0 + GSM_SYM_RATE = (1.0 / GSM_SYM_PERIOD_uS) * 1e6 + SAMPLE_RATE = GSM_SYM_RATE * osr # FIXME: shall be measured (automatically?) for # particular device and particular clock rate. -- To view, visit https://gerrit.osmocom.org/10880 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: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 17:37:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Sep 2018 17:37:44 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10880 ) Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation ...................................................................... trx/radio_if.py: clarify magic numbers in sample rate calculation Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857 --- M python/trx/radio_if.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/80/10880/2 -- To view, visit https://gerrit.osmocom.org/10880 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: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 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 Tue Sep 11 17:37:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Sep 2018 17:37:44 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Hello Piotr Krysik, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10832 to look at the new patch set (#3). Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... apps/grgsm_trx: migrate from getopt to argparse Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d --- M apps/grgsm_trx 1 file changed, 69 insertions(+), 106 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/32/10832/3 -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 18:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Tue, 11 Sep 2018 18:46:37 +0000 Subject: Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts Message-ID: Vasil Velichkov has uploaded this change for review. ( https://gerrit.osmocom.org/10881 Change subject: burst_file_source: Fix reading longer bursts ...................................................................... burst_file_source: Fix reading longer bursts - Read bursts with pmt::deserialize directly from the std::filebuf - Remove the unused unserialized variable - Add tests Since df978693 when the rx_time tags are present in the incomming stream the gsm receiver adds fm_time to the burst's PMT and the bursts that burst file sink writes becomes longer because of the additional field. The burst file source block was expecting all burst to be 147 bytes long and reading files with longer bursts was failing with an unhandled exception. terminate called after throwing an instance of 'pmt::exception' thread[thread-per-block[5]: ]: pmt_cdr: wrong_type : #f what(): pmt::deserialize: malformed input stream, tag value = : 115 Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc --- M lib/misc_utils/burst_file_source_impl.cc M lib/qa_utils/burst_source_impl.cc M python/CMakeLists.txt A python/qa_burst_file_source.py 4 files changed, 110 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/81/10881/1 diff --git a/lib/misc_utils/burst_file_source_impl.cc b/lib/misc_utils/burst_file_source_impl.cc index 4367150..64332c4 100644 --- a/lib/misc_utils/burst_file_source_impl.cc +++ b/lib/misc_utils/burst_file_source_impl.cc @@ -28,8 +28,6 @@ #include "burst_file_source_impl.h" #include "stdio.h" -#define PMT_SIZE 174 - namespace gr { namespace gsm { @@ -86,18 +84,16 @@ void burst_file_source_impl::run() { - char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE); - while (d_input_file.read(unserialized, PMT_SIZE) && !d_finished) + std::filebuf* pbuf = d_input_file.rdbuf(); + while (!d_finished) { - if (d_input_file.bad()) - { + pmt::pmt_t burst = pmt::deserialize(*pbuf); + if (pmt::is_eof_object(burst)) { break; } - - std::string s(unserialized, PMT_SIZE); - pmt::pmt_t burst = pmt::deserialize_str(s); message_port_pub(pmt::mp("out"), burst); } + d_input_file.close(); post(pmt::mp("system"), pmt::cons(pmt::mp("done"), pmt::from_long(1))); } diff --git a/lib/qa_utils/burst_source_impl.cc b/lib/qa_utils/burst_source_impl.cc index db3d85a..f415eaf 100644 --- a/lib/qa_utils/burst_source_impl.cc +++ b/lib/qa_utils/burst_source_impl.cc @@ -31,8 +31,6 @@ #include #include -#define PMT_SIZE 174 - namespace gr { namespace gsm { @@ -110,8 +108,6 @@ void burst_source_impl::run() { - char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE); - for (int i=0; i +# @section LICENSE +# +# Gr-gsm is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# Gr-gsm 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 gr-gsm; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# +# + +from gnuradio import gr, gr_unittest, blocks +import grgsm_swig as grgsm +import tempfile + +class qa_burst_file_sink (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test_blob_only (self): + # prepare the input burst file + temp = tempfile.NamedTemporaryFile() + handle = open(temp.name, "wb") + handle.write(bytearray([ + 0x07, 0x06, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0x02, 0x04, 0x03, 0x01, 0x00, 0x6f, + 0xcd, 0x00, 0x00, 0x25, 0xc9, 0x82, 0x06, 0x1c, 0xf5, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, + 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01 + ])) + handle.flush(); + + src = grgsm.burst_file_source(temp.name); + dst = grgsm.burst_sink(); + self.tb.msg_connect(src, "out", dst, "in") + self.tb.run () + + self.assertEqual([2476418], list(dst.get_framenumbers())) + self.assertEqual([1], list(dst.get_timeslots())) + self.assertEqual([ + "0000001000000101010111111110101000000000010101010111101010101001011011101111000101101111100000000001010101111010101010000000010101011101111010101001"], + list(dst.get_burst_data())) + + def test_fn_time (self): + # prepare the input burst file + temp = tempfile.NamedTemporaryFile() + handle = open(temp.name, "wb") + handle.write(bytearray([ + 0x07, + # the additional fn_time field - 51 bytes + 0x07, 0x07, 0x02, 0x00, 0x07, 0x66, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x07, 0x07, 0x0b, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x3b, 0x73, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3f, 0xe4, 0x99, 0x45, + 0xbe, 0x81, 0xc0, 0xf4, + # the 173 original 173 bytes + 0x06, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0x02, 0x04, 0x03, 0x01, 0x00, 0x6f, + 0xcd, 0x00, 0x00, 0x25, 0xc9, 0x82, 0x06, 0x1c, 0xf5, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, + 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01 + ])) + handle.flush(); + + src = grgsm.burst_file_source(temp.name); + dst = grgsm.burst_sink(); + self.tb.msg_connect(src, "out", dst, "in") + self.tb.run () + + self.assertEqual([2476418], list(dst.get_framenumbers())) + self.assertEqual([1], list(dst.get_timeslots())) + self.assertEqual([ + "0000001000000101010111111110101000000000010101010111101010101001011011101111000101101111100000000001010101111010101010000000010101011101111010101001"], + list(dst.get_burst_data())) + +if __name__ == '__main__': + gr_unittest.run(qa_burst_file_sink, "qa_burst_file_sink.xml") -- To view, visit https://gerrit.osmocom.org/10881 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: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 19:46:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Sep 2018 19:46:15 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10831 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: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 19:46:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 19:48:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 19:48:28 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... Patch Set 2: (1 comment) Patch set 2 already shows type=CBCH, just the comment for it was forgotten and only came through with the reply after that. Anything else that should be resolved? https://gerrit.osmocom.org/#/c/10871/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10871/1//COMMIT_MSG at 22 PS1, Line 22: BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm > maybe the type should also show as CBCH instead of NONE? How does it work, does the CBCH need Chan A [?] Done -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Sep 2018 19:48:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 11 20:09:14 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:09:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b982102db985_64cf5fe68c4846a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 113s] No package 'libpcsclite' found [ 113s] simtrace2-remsim.o: In function `main': [ 113s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 113s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 113s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 113s] apdu_dispatch.o: In function `apdu_segment_in': [ 113s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 113s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 113s] collect2: error: ld returned 1 exit status [ 113s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 113s] make[2]: *** [simtrace2-remsim] Error 1 [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 113s] Makefile:20: recipe for target 'utils' failed [ 113s] make[1]: *** [utils] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] dh_auto_build: make -j1 returned exit code 2 [ 113s] debian/rules:4: recipe for target 'build' failed [ 113s] make: *** [build] Error 2 [ 113s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 113s] [ 113s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:08:59 UTC 2018. [ 113s] [ 113s] ### VM INTERACTION START ### [ 116s] [ 108.093411] sysrq: SysRq : Power Off [ 116s] [ 108.098758] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:09:03 UTC 2018. [ 117s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 11 20:12:57 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:12:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9821d7ed54e_64cf5fe68c48516a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 115s] No package 'libpcsclite' found [ 115s] simtrace2-remsim.o: In function `main': [ 115s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 115s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 115s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 115s] apdu_dispatch.o: In function `apdu_segment_in': [ 115s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 115s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 115s] collect2: error: ld returned 1 exit status [ 115s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 115s] make[2]: *** [simtrace2-remsim] Error 1 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 115s] Makefile:20: recipe for target 'utils' failed [ 115s] make[1]: *** [utils] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 115s] dh_auto_build: make -j1 returned exit code 2 [ 115s] debian/rules:4: recipe for target 'build' failed [ 115s] make: *** [build] Error 2 [ 115s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 115s] [ 115s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:12:48 UTC 2018. [ 115s] [ 115s] ### VM INTERACTION START ### [ 119s] [ 112.107089] sysrq: SysRq : Power Off [ 119s] [ 112.121239] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:12:52 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 Tue Sep 11 20:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 20:23:33 +0000 Subject: Change in libosmocore[master]: tests: fix LDADD: link libosmovty from current build In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/5844 ) Change subject: tests: fix LDADD: link libosmovty from current build ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 20:23:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 11 20:30:57 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:30:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b982610a47e3_64cf5fe68c5542e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 143s] No package 'libpcsclite' found [ 143s] simtrace2-remsim.o: In function `main': [ 143s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 143s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 143s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 143s] apdu_dispatch.o: In function `apdu_segment_in': [ 143s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 143s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 143s] collect2: error: ld returned 1 exit status [ 143s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 143s] make[2]: *** [simtrace2-remsim] Error 1 [ 143s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 143s] Makefile:20: recipe for target 'utils' failed [ 143s] make[1]: *** [utils] Error 2 [ 143s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 143s] dh_auto_build: make -j1 returned exit code 2 [ 143s] debian/rules:4: recipe for target 'build' failed [ 143s] make: *** [build] Error 2 [ 143s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 143s] [ 143s] lamb02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:30:44 UTC 2018. [ 143s] [ 143s] ### VM INTERACTION START ### [ 147s] [ 134.053987] sysrq: SysRq : Power Off [ 147s] [ 134.059660] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] lamb02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:30:48 UTC 2018. [ 147s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 11 20:32:23 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:32:23 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9826664d151_64cf5fe68c5547b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 261s] No package 'libpcsclite' found [ 261s] simtrace2-remsim.o: In function `main': [ 261s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 261s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 261s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 261s] apdu_dispatch.o: In function `apdu_segment_in': [ 261s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 261s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 261s] collect2: error: ld returned 1 exit status [ 261s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 261s] make[2]: *** [simtrace2-remsim] Error 1 [ 261s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 261s] Makefile:20: recipe for target 'utils' failed [ 261s] make[1]: *** [utils] Error 2 [ 261s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 261s] dh_auto_build: make -j1 returned exit code 2 [ 261s] debian/rules:4: recipe for target 'build' failed [ 261s] make: *** [build] Error 2 [ 261s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 261s] [ 261s] lamb07 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:32:11 UTC 2018. [ 261s] [ 261s] ### VM INTERACTION START ### [ 264s] [ 221.416748] sysrq: SysRq : Power Off [ 264s] [ 221.425530] reboot: Power down [ 264s] ### VM INTERACTION END ### [ 264s] [ 264s] lamb07 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:32:14 UTC 2018. [ 264s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 11 20:33:31 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:33:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9826a16a026_64cf5fe68c554983@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 132s] No package 'libpcsclite' found [ 132s] simtrace2-remsim.o: In function `main': [ 132s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 132s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 132s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 132s] apdu_dispatch.o: In function `apdu_segment_in': [ 132s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 132s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 132s] collect2: error: ld returned 1 exit status [ 132s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 132s] make[2]: *** [simtrace2-remsim] Error 1 [ 132s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 132s] Makefile:20: recipe for target 'utils' failed [ 132s] make[1]: *** [utils] Error 2 [ 132s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 132s] dh_auto_build: make -j1 returned exit code 2 [ 132s] debian/rules:4: recipe for target 'build' failed [ 132s] make: *** [build] Error 2 [ 132s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 132s] [ 132s] build78 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:33:24 UTC 2018. [ 132s] [ 132s] ### VM INTERACTION START ### [ 136s] [ 125.367987] sysrq: SysRq : Power Off [ 136s] [ 125.482507] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] build78 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:33:28 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 Sep 11 20:33:31 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:33:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9826a2115df_64cf5fe68c55502f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 150s] No package 'libpcsclite' found [ 150s] simtrace2-remsim.o: In function `main': [ 150s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 150s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 150s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 150s] apdu_dispatch.o: In function `apdu_segment_in': [ 150s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 150s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 150s] collect2: error: ld returned 1 exit status [ 150s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 150s] make[2]: *** [simtrace2-remsim] Error 1 [ 150s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 150s] Makefile:20: recipe for target 'utils' failed [ 150s] make[1]: *** [utils] Error 2 [ 150s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 150s] dh_auto_build: make -j1 returned exit code 2 [ 150s] debian/rules:4: recipe for target 'build' failed [ 150s] make: *** [build] Error 2 [ 150s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 150s] [ 150s] build80 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:33:18 UTC 2018. [ 150s] [ 150s] ### VM INTERACTION START ### [ 153s] [ 142.395224] sysrq: SysRq : Power Off [ 153s] [ 142.565872] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] build80 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:33:22 UTC 2018. [ 153s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 11 20:36:58 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:36:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b98277626ca5_64cf5fe68c5558de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 229s] No package 'libpcsclite' found [ 229s] simtrace2-remsim.o: In function `main': [ 229s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 229s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 229s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 229s] apdu_dispatch.o: In function `apdu_segment_in': [ 229s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 229s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 229s] collect2: error: ld returned 1 exit status [ 229s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 229s] make[2]: *** [simtrace2-remsim] Error 1 [ 229s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 229s] Makefile:20: recipe for target 'utils' failed [ 229s] make[1]: *** [utils] Error 2 [ 229s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 229s] dh_auto_build: make -j1 returned exit code 2 [ 229s] debian/rules:4: recipe for target 'build' failed [ 229s] make: *** [build] Error 2 [ 229s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 229s] [ 229s] cloud130 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:36:38 UTC 2018. [ 229s] [ 229s] ### VM INTERACTION START ### [ 232s] [ 201.537241] sysrq: SysRq : Power Off [ 232s] [ 201.548918] reboot: Power down [ 234s] ### VM INTERACTION END ### [ 234s] [ 234s] cloud130 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:36:44 UTC 2018. [ 234s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 11 20:37:15 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:37:15 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9827911c731_64cf5fe68c5561ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 258s] No package 'libpcsclite' found [ 258s] simtrace2-remsim.o: In function `main': [ 258s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 258s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 258s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 258s] apdu_dispatch.o: In function `apdu_segment_in': [ 258s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 258s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 258s] collect2: error: ld returned 1 exit status [ 258s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 258s] make[2]: *** [simtrace2-remsim] Error 1 [ 258s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 258s] Makefile:20: recipe for target 'utils' failed [ 258s] make[1]: *** [utils] Error 2 [ 258s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 258s] dh_auto_build: make -j1 returned exit code 2 [ 258s] debian/rules:4: recipe for target 'build' failed [ 258s] make: *** [build] Error 2 [ 258s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 258s] [ 258s] lamb06 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:36:55 UTC 2018. [ 258s] [ 258s] ### VM INTERACTION START ### [ 262s] [ 249.329314] sysrq: SysRq : Power Off [ 262s] [ 249.335150] reboot: Power down [ 262s] ### VM INTERACTION END ### [ 262s] [ 262s] lamb06 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:36:59 UTC 2018. [ 262s] -- 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 Sep 11 20:46:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 20:46:11 +0000 Subject: Change in libosmocore[master]: tests: fix LDADD: link libosmovty from current build In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/5844 ) Change subject: tests: fix LDADD: link libosmovty from current build ...................................................................... Patch Set 4: > $ make check V=s 2>&1 | grep libosmovty > > I see the following lines only: > > /bin/bash ../libtool --tag=CC --mode=link gcc -Wall -g -O2 > -DBUILDING_LIBOSMOCORE -Wall -o vty/vty_test vty/vty_test.o > ../src/libosmocore.la -ltalloc ../src/vty/libosmovty.la Exactly, only vty_test so far linked libosmovty directly from the build tree. The others apparently implicitly link it from where ever they can find it, in my case from /usr/local/lib? In an effort to understand wth is going on with linking, I reproduced this issue now: Build and install libosmocore from the tip of branch neels/logging. This makes logging_vty.c use loglevel_strs[], assert_loginfo(), tall_log_ctx from logging.c, and adds loglevel_descriptions[] to logging.c and calls that from logging_vty.c, too. So that means now logging_vty.c depends on these symbols to be public in libosmocore.a, where they were static before. With this state of linking installed, everything works fine. Now go back to libosmocore master, where these symbols are still static. Mind you, /usr/local/lib already has a libosmovty.a that depends on these symbols to be public in libosmocore. When I try to build now, I get CCLD ctrl/ctrl_test /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `loglevel_strs' /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `assert_loginfo' /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `log_level_description' /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `tall_log_ctx' collect2: error: ld returned 1 exit status Let's see /bin/bash ../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -DBUILDING_LIBOSMOCORE -Wall -o ctrl/ctrl_test ctrl/ctrl_test.o ../src/libosmocore.la -ltalloc ../src/ctrl/libosmoctrl.la libtool: link: gcc -Wall -g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -DBUILDING_LIBOSMOCORE -Wall -o ctrl/.libs/ctrl_test ctrl/ctrl_test.o ../src/.libs/libosmocore.so -ltalloc ../src/ctrl/.libs/libosmoctrl.so /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `loglevel_strs' /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `assert_loginfo' /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `log_level_description' /usr/bin/ld: /usr/local/lib/libosmovty.so.4: undefined reference to `tall_log_ctx' collect2: error: ld returned 1 exit status Clearly, libosmovty is not listed as linked library. But for some reason, libtool still pulls in a libosmovty. That's because of libosmoctrl.so! ? ldd src/ctrl/.libs/libosmoctrl.so linux-vdso.so.1 (0x00007ffced03f000) libasan.so.5 => /usr/lib/x86_64-linux-gnu/libasan.so.5 (0x00007f26c291b000) libtalloc.so.2 => /usr/lib/x86_64-linux-gnu/libtalloc.so.2 (0x00007f26c2903000) libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f26c26d4000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f26c22bb000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f26c2171000) libubsan.so.1 => /usr/lib/x86_64-linux-gnu/libubsan.so.1 (0x00007f26c1650000) [...] It does so from /usr/local/lib in my case. The solution is thus: any program built in libosmocore.git, here regression test binary, that links libosmoctrl, *must* also make sure to link libosmovty and libosmogsm from the source tree, or the build works only when we're lucky. -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 20:46:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 11 20:56:07 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 11 Sep 2018 20:56:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b982bee24fd3_64cf5fe68c5633fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 273s] No package 'libpcsclite' found [ 273s] simtrace2-remsim.o: In function `main': [ 273s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 273s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 273s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 273s] apdu_dispatch.o: In function `apdu_segment_in': [ 273s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 273s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 273s] collect2: error: ld returned 1 exit status [ 273s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 273s] make[2]: *** [simtrace2-remsim] Error 1 [ 273s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 273s] Makefile:20: recipe for target 'utils' failed [ 273s] make[1]: *** [utils] Error 2 [ 273s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 273s] dh_auto_build: make -j1 returned exit code 2 [ 273s] debian/rules:4: recipe for target 'build' failed [ 273s] make: *** [build] Error 2 [ 273s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 273s] [ 273s] armbuild01 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:55:51 UTC 2018. [ 273s] [ 273s] ### VM INTERACTION START ### [ 276s] [ 246.604350] SysRq : Power Off [ 276s] [ 246.610976] reboot: Power down [ 276s] ### VM INTERACTION END ### [ 276s] [ 276s] armbuild01 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 11 20:55:54 UTC 2018. [ 276s] -- 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 Sep 11 21:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 21:19:44 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/5844 to look at the new patch set (#5). Change subject: fix tests linking: don't use system installed libs ...................................................................... fix tests linking: don't use system installed libs Do not link against the system-wide installed libosmo* libs when building the regression test programs. Always use the locally built ones. Linking some libosmo libraries causes libtool to pull in other libosmo libs even though they were not explicitly named. For example, ctrl_test explicitly links libosmoctrl, but this also has dependencies to libosmovty and libosmogsm: ldd src/ctrl/.libs/libosmoctrl.so | grep osmo libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f26c26d4000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f26c22bb000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f26c2171000) If we omit explicit LDADD of these dependencies in the Makefile.am, libtool will take the first canonical place to find them, which may just be the already installed older versions of the same libs, which may or may not be compatible with the current build. In any case, it is never intended to link installed libs. All library dependencies are listed by this quick script: cd libosmocore for l in $(find . -name "*.so") ; do echo; echo "$l"; ldd $l | grep libosmo; done ./.libs/libosmocore.so ./coding/.libs/libosmocoding.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f25fc3c2000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f25fbfa9000) libosmocodec.so.0 => /usr/local/lib/libosmocodec.so.0 (0x00007f25fbf9b000) ./codec/.libs/libosmocodec.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fb4c900d000) ./ctrl/.libs/libosmoctrl.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f5df5129000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f5df4d10000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f5df4bc6000) ./gb/.libs/libosmogb.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f788e536000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f788e3ec000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f788dfd3000) ./vty/.libs/libosmovty.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f3b7ed21000) ./gsm/.libs/libosmogsm.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fc69472e000) ./sim/.libs/libosmosim.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f2f6412d000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f2f63d14000) Add all explicit linking of all required library dependencies in all regression test programs, as shown by above listing. Example for reproducing a problem: In libosmocore.a, introduce a new function, and call that from libosmovty code. For example, I made loglevel_strs non-static in logging.c, and used that in logging_vty.c. Build and install this in a place where libtool can find it. Then go back to before this change and rebuild. You will see that linking ctrl_test (before this patch) then complains about libosmovty requiring the loglevel_strs symbol which it cannot find in libosmocore.so. Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 --- M tests/Makefile.am 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/5844/5 -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 21:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Sep 2018 21:21:55 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/5844 to look at the new patch set (#6). Change subject: fix tests linking: don't use system installed libs ...................................................................... fix tests linking: don't use system installed libs Do not link against the system-wide installed libosmo* libs when building the regression test programs. Always use the locally built ones. Linking some libosmo libraries causes libtool to pull in other libosmo libs even though they were not explicitly named. For example, ctrl_test explicitly links libosmoctrl, but this also has dependencies to libosmovty and libosmogsm: ldd src/ctrl/.libs/libosmoctrl.so | grep osmo libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f26c26d4000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f26c22bb000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f26c2171000) If we omit explicit LDADD of these dependencies in the Makefile.am, libtool will take the first canonical place to find them, which may just be the already installed older versions of the same libs, which may or may not be compatible with the current build. In any case, it is never intended to link installed libs. All library dependencies are listed by this quick script: cd libosmocore for l in $(find . -name "*.so") ; do echo; echo "$l"; ldd $l | grep libosmo; done ./.libs/libosmocore.so ./coding/.libs/libosmocoding.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f25fc3c2000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f25fbfa9000) libosmocodec.so.0 => /usr/local/lib/libosmocodec.so.0 (0x00007f25fbf9b000) ./codec/.libs/libosmocodec.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fb4c900d000) ./ctrl/.libs/libosmoctrl.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f5df5129000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f5df4d10000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f5df4bc6000) ./gb/.libs/libosmogb.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f788e536000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f788e3ec000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f788dfd3000) ./vty/.libs/libosmovty.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f3b7ed21000) ./gsm/.libs/libosmogsm.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fc69472e000) ./sim/.libs/libosmosim.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f2f6412d000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f2f63d14000) Add all explicit linking of all required library dependencies in all regression test programs, as shown by above listing. Example for reproducing a problem: In libosmocore.a, introduce a new function, and call that from libosmovty code. For example, I made loglevel_strs non-static in logging.c, and used that in logging_vty.c. Build and install this in a place where libtool can find it. Then go back to before this change and rebuild. You will see that linking ctrl_test (before this patch) then complains about libosmovty requiring the loglevel_strs symbol which it cannot find in libosmocore.so. Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 --- M tests/Makefile.am 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/5844/6 -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 11 21:43:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Tue, 11 Sep 2018 21:43:40 +0000 Subject: Change in gr-gsm[master]: Add .gitreview similar to the other osmocom's projects Message-ID: Vasil Velichkov has uploaded this change for review. ( https://gerrit.osmocom.org/10882 Change subject: Add .gitreview similar to the other osmocom's projects ...................................................................... Add .gitreview similar to the other osmocom's projects A gitreview file is required to use git review. More information about git review https://docs.openstack.org/infra/git-review/ https://www.mediawiki.org/wiki/Gerrit/git-review Change-Id: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4 --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/82/10882/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..85e5df7 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=gr-gsm -- To view, visit https://gerrit.osmocom.org/10882 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: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4 Gerrit-Change-Number: 10882 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:14 +0000 Subject: Change in libosmocore[master]: logging vty: add VTY transcript test Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10883 Change subject: logging vty: add VTY transcript test ...................................................................... logging vty: add VTY transcript test I am setting out to refactor various details about logging. To show the effect, I am first adding this new test to illustrate the exact effects on the various osmo programs. Add logging_vty_test.c as a standalone program that simply defines a few logging categories and opens a telnet vty to play with. Add logging_vty_test.vty, as an osmo_verify_transcript_vty.py test script. Add --enable-external-tests to configure.ac, to enable running logging_vty_test.vty during 'make check'. Also allow running 'make vty-test' without the need to first configure with --enable-external-tests (a flexibility I've missed many times over in the other osmo source trees). Add a Makefile.am stub for external CTRL tests, basically a copy-paste from osmo-msc.git. I doubt that libosmocore will get python driven CTRL interface testing any time soon, but if so we will know to not run it concurrently. Change-Id: I948e832a33131f8eab98651d6010ceb0ccbc9a9c --- M configure.ac M tests/Makefile.am A tests/logging/logging_vty_test.c A tests/logging/logging_vty_test.vty 4 files changed, 530 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/10883/1 diff --git a/configure.ac b/configure.ac index dd5f15b..bc3358a 100644 --- a/configure.ac +++ b/configure.ac @@ -296,6 +296,21 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AM_PATH_PYTHON + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + 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]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + CFLAGS="$CFLAGS -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS="$CPPFLAGS -DBUILDING_LIBOSMOCORE -Wall" diff --git a/tests/Makefile.am b/tests/Makefile.am index 5d07695..18d4bb4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,9 @@ abis/abis_test endian/endian_test sercomm/sercomm_test \ prbs/prbs_test gsm23003/gsm23003_test \ codec/codec_ecu_fr_test timer/clk_override_test \ - oap/oap_client_test + oap/oap_client_test \ + logging/logging_vty_test \ + $(NULL) if ENABLE_MSGFILE check_PROGRAMS += msgfile/msgfile_test @@ -148,6 +150,9 @@ logging_logging_test_SOURCES = logging/logging_test.c +logging_logging_vty_test_SOURCES = logging/logging_vty_test.c +logging_logging_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la + fr_fr_test_SOURCES = fr/fr_test.c fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/vty/libosmovty.la \ @@ -280,6 +285,7 @@ check-local: atconfig $(TESTSUITE) cat /proc/cpuinfo $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + $(MAKE) $(AM_MAKEFLAGS) ext-tests installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ @@ -298,3 +304,25 @@ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ --target-path $(builddir)/conv + +if ENABLE_EXT_TESTS +ext-tests: +# don't run vty and ctrl tests concurrently so that the ports don't conflict + $(MAKE) vty-test + $(MAKE) ctrl-test +else +ext-tests: + echo "Not running python-based external tests (determined at configure-time)" +endif + +# To update the VTY script from current application behavior, +# pass -u to osmo_verify_transcript_vty.py by doing: +# make vty-test U=-u +vty-test: + osmo_verify_transcript_vty.py -v \ + -p 42042 \ + -r "$(top_builddir)/tests/logging/logging_vty_test" \ + $(U) $(srcdir)/logging/*.vty + +ctrl-test: + echo "No CTRL tests exist currently" diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c new file mode 100644 index 0000000..806a460 --- /dev/null +++ b/tests/logging/logging_vty_test.c @@ -0,0 +1,296 @@ +/* test program with a vty interface to test logging behavior */ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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. + * + */ + +#define _GNU_SOURCE +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "config.h" + +void *root_ctx = NULL; + +enum { + DAA, + DBB, + DCCC, + DDDDD, + DEEE, +}; + +DEFUN(log_sweep, log_sweep_cmd, + "log-sweep [CATEGORY]", + "Log once for all categories on all levels\n") +{ + int only_category = argc ? log_parse_category(argv[0]) : -1; + + if (argc && only_category < 0) { + vty_out(vty, "%% Error: unknown category: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + +#define LOG_LEVEL(CAT, LEVEL) \ + if (only_category < 0 || only_category == CAT) \ + LOGP(CAT, LEVEL, "Log message for " #CAT " on level " #LEVEL "\n") + +#define LOG_ALL_LEVELS(CAT) \ + LOG_LEVEL(CAT, LOGL_DEBUG); \ + LOG_LEVEL(CAT, LOGL_INFO); \ + LOG_LEVEL(CAT, LOGL_NOTICE); \ + LOG_LEVEL(CAT, LOGL_ERROR); \ + LOG_LEVEL(CAT, LOGL_FATAL) + + LOG_ALL_LEVELS(DAA); + LOG_ALL_LEVELS(DBB); + LOG_ALL_LEVELS(DCCC); + LOG_ALL_LEVELS(DDDDD); + LOG_ALL_LEVELS(DEEE); + + vty_out(vty, "%s", VTY_NEWLINE); + + return CMD_SUCCESS; +} + +static void vty_commands_init() +{ + install_element_ve(&log_sweep_cmd); +} + +static const struct log_info_cat default_categories[] = { + [DAA] = { + .name = "DAA", + .description = "Antropomorphic Armadillos (AA)", + .color = "\033[1;31m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, + [DBB] = { + .name = "DBB", + .description = "Bidirectional Breadspread (BB)", + .color = "\033[1;32m", + .enabled = 1, .loglevel = LOGL_INFO, + }, + [DCCC] = { + .name = "DCCC", + .description = "Chaos Communication Congress (CCC)", + .color = "\033[1;33m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DDDDD] = { + .name = "DDDDD", + .description = "Dehydrated Dribbling Duck Dunkers (DDDD)", + .color = "\033[1;34m", + .enabled = 1, .loglevel = LOGL_ERROR, + }, + [DEEE] = { + .name = "DEEE", + .description = "Exhaustive Entropy Extraction (EEE)", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_FATAL, + }, +}; + +const struct log_info log_info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +static void print_help() +{ + printf( "options:\n" + " -h --help this text\n" + " -d --debug MASK Enable debugging (e.g. -d DRSL:DOML:DLAPDM)\n" + " -D --daemonize For the process into a background daemon\n" + " -c --config-file Specify the filename of the config file\n" + " -s --disable-color Don't use colors in stderr log output\n" + " -T --timestamp Prefix every log line with a timestamp\n" + " -V --version Print version information and exit\n" + " -e --log-level Set a global log-level\n" + ); +} + +static struct { + const char *config_file; + int daemonize; +} cmdline_config = {}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_idx = 0, c; + static const struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "debug", 1, 0, 'd' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "disable-color", 0, 0, 's' }, + { "timestamp", 0, 0, 'T' }, + { "version", 0, 0, 'V' }, + { "log-level", 1, 0, 'e' }, + {} + }; + + c = getopt_long(argc, argv, "hc:d:Dc:sTVe:", + long_options, &option_idx); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_config.daemonize = 1; + break; + case 'c': + cmdline_config.config_file = optarg; + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + } + } +} + +static int quit = 0; + +static void signal_handler(int signal) +{ + fprintf(stdout, "signal %u received\n", signal); + + switch (signal) { + case SIGINT: + case SIGTERM: + quit++; + break; + case SIGABRT: + osmo_generate_backtrace(); + /* in case of abort, we want to obtain a talloc report + * and then return to the caller, who will abort the process */ + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(root_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static struct vty_app_info vty_info = { + .name = "logging_vty_test", + .version = PACKAGE_VERSION, +}; + +int main(int argc, char **argv) +{ + int rc; + + root_ctx = talloc_named_const(NULL, 0, "logging_vty_test"); + + vty_info.tall_ctx = root_ctx; + vty_init(&vty_info); + + osmo_init_logging2(root_ctx, &log_info); + + vty_commands_init(); + + handle_options(argc, argv); + + logging_vty_add_cmds(&log_info); + osmo_talloc_vty_add_cmds(); + + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + + if (cmdline_config.config_file) { + rc = vty_read_config_file(cmdline_config.config_file, NULL); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + cmdline_config.config_file); + return 1; + } + } + + rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + if (rc < 0) + return 2; + + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + + if (cmdline_config.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + return 6; + } + } + + while (!quit) { + log_reset_context(); + osmo_select_main(0); + } + + log_fini(); + + talloc_free(root_ctx); + talloc_free(tall_vty_ctx); + + return 0; +} diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty new file mode 100644 index 0000000..c57b70f --- /dev/null +++ b/tests/logging/logging_vty_test.vty @@ -0,0 +1,190 @@ +logging_vty_test> enable + +logging_vty_test# ! Note that 'logging level all everything' is still printed! +logging_vty_test# show running-config +... +log stderr +... + logging level all everything + logging level aa debug + logging level bb info + logging level ccc notice + logging level dddd error + logging level eee fatal +... + +logging_vty_test# configure terminal +logging_vty_test(config)# no log stderr +logging_vty_test(config)# exit + +logging_vty_test# logging enable +logging_vty_test# logging filter all 1 +logging_vty_test# logging print category-hex 0 +logging_vty_test# logging print category 1 +logging_vty_test# logging print level 1 +logging_vty_test# logging color 0 +logging_vty_test# logging print file 0 + + +logging_vty_test# list +... !logging + logging enable + logging disable + logging filter all (0|1) + logging color (0|1) + logging timestamp (0|1) + logging print extended-timestamp (0|1) + logging print category (0|1) + logging print category-hex (0|1) + logging print level (0|1) + logging print file (0|1|basename) [last] + logging set-log-mask MASK + logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (everything|debug|info|notice|error|fatal) + show logging vty +... !logging + +logging_vty_test# logging ? + enable Enables logging to this vty + disable Disables logging to this vty + filter Filter log messages + color Configure color-printing for log messages + timestamp Configure log message timestamping + print Log output settings + set-log-mask Set the logmask of this logging target + level Set the log level for a specified category + +logging_vty_test# logging level ? + all Global setting for all subsystems + aa Antropomorphic Armadillos (AA) + bb Bidirectional Breadspread (BB) + ccc Chaos Communication Congress (CCC) + dddd Dehydrated Dribbling Duck Dunkers (DDDD) + eee Exhaustive Entropy Extraction (EEE) + lglobal Library-internal global log family +... + +logging_vty_test# logging level aa ? + everything Don't use. It doesn't log anything + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + +logging_vty_test# logging level all ? + everything Don't use. It doesn't log anything + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + + +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all error +logging_vty_test# log-sweep +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all notice +logging_vty_test# log-sweep +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB DEBUG Log message for DBB on level LOGL_DEBUG +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC DEBUG Log message for DCCC on level LOGL_DEBUG +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE DEBUG Log message for DEEE on level LOGL_DEBUG +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! 'logging level all' overrides everything, be it stronger or weaker +logging_vty_test# logging level all notice +logging_vty_test# logging level eee debug +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all notice +logging_vty_test# logging level eee fatal +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! Old 'logging level all everything' has no effect +logging_vty_test# logging level all everything +% Ignoring deprecated logging level everything +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! There is currently no way to remove the 'logging level all' level! -- To view, visit https://gerrit.osmocom.org/10883 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: I948e832a33131f8eab98651d6010ceb0ccbc9a9c Gerrit-Change-Number: 10883 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:15 +0000 Subject: Change in libosmocore[master]: logging vty: rewrite 'logging level' vty cmd generation Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10884 Change subject: logging vty: rewrite 'logging level' vty cmd generation ...................................................................... logging vty: rewrite 'logging level' vty cmd generation Completely drop the implementations of log_vty_command_{str,description}(). These functions have been public API once, marked as deprecated since c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7 (March 2017). I considered to keep them, or reduce them to useless stubs, but it is quite silly, really. These functions are completely and utterly useless outside of libosmocore. Any program linking these deserves to fail. Re-implement vty logging level command gen, in logging_vty.c. logging.c is simply the wrong place for that. Introduce logging_internal.h to share logging definitions to logging_vty.c without publishing as API. Introduce static gen_logging_level_cmd_strs() to compose a list of category arguments with their descriptions for VTY commands. Use osmo_talloc_asprintf() instead of the previous error prone and chaotic strlen() counting method. Do not dynamically generate log level arguments, just keep static strings. We are super unlikely to ever change the log levels we have. No changes in logging_vty_test.vty: proves that there is no functional change. All of this, besides introducing basic sanity, is cosmetic preparation to be able to re-use the generic command generation code for arbitrary commands with category or level args (for deprecated and new keywords). Rationale: I want to hide 'all' and 'everything' from the VTY command documentation, by means of deprecating. I first tried to simply define a deprecated 'logging level CAT everything' command: logging level (all|rsl|rr|...) (debug|info|notice|error|fatal) logging level CAT everything # <- deprecated and hidden But unfortunately, command matching doesn't work as intended when the CAT argument reflects a valid category; I want it to invoke the deprecated function as soon as the 'everything' keyword follows, but it stays stuck to the "valid" command when the category argument matches an explicit keyword in that list, and will throw an error on the following 'everything' keyword. I.e.: logging level rsl everything % Unknown command # <-- leads to config file parse error logging level unknown_string everything % Ignoring deprecated 'everything' # <-- works only for invalid categories So I need to define 'everything' separately, again with a list of each valid category instead of a generic CAT arg. Change-Id: I3b083f27e3d751ccec258880ae7676e9af959a63 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/core/logging_internal.h M src/logging.c M src/vty/logging_vty.c 5 files changed, 82 insertions(+), 172 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/10884/1 diff --git a/include/Makefile.am b/include/Makefile.am index ef8ec65..19695d1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -152,7 +152,10 @@ endif noinst_HEADERS = \ - osmocom/gsm/kasumi.h osmocom/gsm/gea.h + osmocom/gsm/kasumi.h \ + osmocom/gsm/gea.h \ + osmocom/core/logging_internal.h \ + $(NULL) osmocom/core/bit%gen.h: osmocom/core/bitXXgen.h.tpl $(AM_V_GEN)$(MKDIR_P) $(dir $@) diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index c60143d..295e5a8 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -374,10 +374,6 @@ void log_add_target(struct log_target *target); void log_del_target(struct log_target *target); -/* Generate command string for VTY use */ -const char *log_vty_command_string() OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; -const char *log_vty_command_description() OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; - struct log_target *log_target_find(int type, const char *fname); extern struct llist_head osmo_log_target_list; diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h new file mode 100644 index 0000000..55b1bbd --- /dev/null +++ b/include/osmocom/core/logging_internal.h @@ -0,0 +1,14 @@ +#pragma once + +/*! \defgroup logging_internal Osmocom logging internals + * @{ + * \file logging_internal.h */ + +#include + +extern void *tall_log_ctx; +extern const struct log_info *osmo_log_info; + +void assert_loginfo(const char *src); + +/*! @} */ diff --git a/src/logging.c b/src/logging.c index de0f2b0..7c2d61f 100644 --- a/src/logging.c +++ b/src/logging.c @@ -35,7 +35,6 @@ #include #include #include -#include #ifdef HAVE_STRINGS_H #include @@ -61,12 +60,10 @@ struct log_info *osmo_log_info; static struct log_context log_context; -static void *tall_log_ctx = NULL; +void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); -#define LOGLEVEL_DEFS 6 /* Number of loglevels.*/ - -static const struct value_string loglevel_strs[LOGLEVEL_DEFS+1] = { +static const struct value_string loglevel_strs[] = { { 0, "EVERYTHING" }, { LOGL_DEBUG, "DEBUG" }, { LOGL_INFO, "INFO" }, @@ -175,19 +172,7 @@ }, }; -/*! descriptive string for each log level */ -/* You have to keep this in sync with the structure loglevel_strs. */ -static const char *loglevel_descriptions[LOGLEVEL_DEFS+1] = { - "Don't use. It doesn't log anything", - "Log debug messages and higher levels", - "Log informational messages and higher levels", - "Log noticeable messages and higher levels", - "Log error messages and higher levels", - "Log only fatal messages", - NULL, -}; - -static void assert_loginfo(const char *src) +void assert_loginfo(const char *src) { if (!osmo_log_info) { fprintf(stderr, "ERROR: osmo_log_info == NULL! " @@ -963,149 +948,6 @@ return rc; } -/*! Generates the logging command string for VTY - * \param[in] unused_info Deprecated parameter, no longer used! - * \returns vty command string for use by VTY command node - */ -const char *log_vty_command_string() -{ - struct log_info *info = osmo_log_info; - int len = 0, offset = 0, ret, i, rem; - int size = strlen("logging level (all|) ()") + 1; - char *str; - - assert_loginfo(__func__); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name == NULL) - continue; - size += strlen(info->cat[i].name) + 1; - } - - for (i = 0; i < LOGLEVEL_DEFS; i++) - size += strlen(loglevel_strs[i].str) + 1; - - rem = size; - str = talloc_zero_size(tall_log_ctx, size); - if (!str) - return NULL; - - ret = snprintf(str + offset, rem, "logging level (all|"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name) { - int j, name_len = strlen(info->cat[i].name)+1; - char name[name_len]; - - for (j = 0; j < name_len; j++) - name[j] = tolower((unsigned char)info->cat[i].name[j]); - - name[name_len-1] = '\0'; - ret = snprintf(str + offset, rem, "%s|", name+1); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } - } - offset--; /* to remove the trailing | */ - rem++; - - ret = snprintf(str + offset, rem, ") ("); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - for (i = 0; i < LOGLEVEL_DEFS; i++) { - int j, loglevel_str_len = strlen(loglevel_strs[i].str)+1; - char loglevel_str[loglevel_str_len]; - - for (j = 0; j < loglevel_str_len; j++) - loglevel_str[j] = tolower((unsigned char)loglevel_strs[i].str[j]); - - loglevel_str[loglevel_str_len-1] = '\0'; - ret = snprintf(str + offset, rem, "%s|", loglevel_str); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } - offset--; /* to remove the trailing | */ - rem++; - - ret = snprintf(str + offset, rem, ")"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); -err: - str[size-1] = '\0'; - return str; -} - -/*! Generates the logging command description for VTY - * \param[in] unused_info Deprecated parameter, no longer used! - * \returns logging command description for use by VTY command node - */ -const char *log_vty_command_description() -{ - struct log_info *info = osmo_log_info; - char *str; - int i, ret, len = 0, offset = 0, rem; - unsigned int size = - strlen(LOGGING_STR - "Set the log level for a specified category\n") + 1; - - assert_loginfo(__func__); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name == NULL) - continue; - size += strlen(info->cat[i].description) + 1; - } - - for (i = 0; i < LOGLEVEL_DEFS; i++) - size += strlen(loglevel_descriptions[i]) + 1; - - size += strlen("Global setting for all subsystems") + 1; - rem = size; - str = talloc_zero_size(tall_log_ctx, size); - if (!str) - return NULL; - - ret = snprintf(str + offset, rem, LOGGING_STR - "Set the log level for a specified category\n"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - ret = snprintf(str + offset, rem, - "Global setting for all subsystems\n"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name == NULL) - continue; - ret = snprintf(str + offset, rem, "%s\n", - info->cat[i].description); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } - for (i = 0; i < LOGLEVEL_DEFS; i++) { - ret = snprintf(str + offset, rem, "%s\n", - loglevel_descriptions[i]); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } -err: - str[size-1] = '\0'; - return str; -} - /*! Initialize the Osmocom logging core * \param[in] inf Information regarding logging categories * \param[in] ctx \ref talloc context for logging allocations diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 7d97bb1..2b001bc 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,19 @@ #include #define LOG_STR "Configure logging sub-system\n" +#define LEVEL_STR "Set the log level for a specified category\n" + +#define CATEGORY_ALL_STR "Global setting for all subsystems\n" + +#define LOG_LEVEL_ARGS "debug|info|notice|error|fatal" +#define LOG_LEVEL_STRS \ + "Log debug messages and higher levels\n" \ + "Log informational messages and higher levels\n" \ + "Log noticeable messages and higher levels\n" \ + "Log error messages and higher levels\n" \ + "Log only fatal messages\n" + +#define EVERYTHING_STR "Don't use. It doesn't log anything\n" /*! \file logging_vty.c * Configuration of logging from VTY @@ -58,8 +72,6 @@ * */ -extern const struct log_info *osmo_log_info; - static void _vty_output(struct log_target *tgt, unsigned int level, const char *line) { @@ -268,6 +280,47 @@ return CMD_SUCCESS; } +static void add_category_strings(char **cmd_str_p, char **doc_str_p, + const struct log_info *categories) +{ + int i; + for (i = 0; i < categories->num_cat; i++) { + if (categories->cat[i].name == NULL) + continue; + /* skip the leading 'D' in each category name, hence '+ 1' */ + osmo_talloc_asprintf(tall_log_ctx, *cmd_str_p, "%s%s", + i ? "|" : "", + osmo_str_tolower(categories->cat[i].name + 1)); + osmo_talloc_asprintf(tall_log_ctx, *doc_str_p, "%s\n", + categories->cat[i].description); + } +} + +static void gen_logging_level_cmd_strs(struct cmd_element *cmd, + const char *level_args, const char *level_strs) +{ + char *cmd_str = NULL; + char *doc_str = NULL; + + assert_loginfo(__func__); + + OSMO_ASSERT(cmd->string == NULL); + OSMO_ASSERT(cmd->doc == NULL); + + osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logging level (all|"); + osmo_talloc_asprintf(tall_log_ctx, doc_str, + LOGGING_STR + LEVEL_STR + CATEGORY_ALL_STR); + add_category_strings(&cmd_str, &doc_str, osmo_log_info); + osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", level_args); + osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", level_strs); + + cmd->string = cmd_str; + cmd->doc = doc_str; +} + +/* logging level (all|) (everything|debug|...|fatal) */ DEFUN(logging_level, logging_level_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -847,7 +900,7 @@ name); printf("%s\n", cmd->string); cmd->func = log_deprecated_func; - cmd->doc = "Set the log level for a specified category\n" + cmd->doc = LEVEL_STR "Deprecated Category\n"; cmd->attr = CMD_ATTR_DEPRECATED; @@ -871,9 +924,11 @@ install_element_ve(&logging_set_category_mask_cmd); install_element_ve(&logging_set_category_mask_old_cmd); - /* Logging level strings are generated dynamically. */ - logging_level_cmd.string = log_vty_command_string(); - logging_level_cmd.doc = log_vty_command_description(); + /* logging level (all|) (everything|debug|...|fatal) */ + gen_logging_level_cmd_strs(&logging_level_cmd, + "(everything|" LOG_LEVEL_ARGS ")", + EVERYTHING_STR LOG_LEVEL_STRS); + install_element_ve(&logging_level_cmd); install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); -- To view, visit https://gerrit.osmocom.org/10884 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: I3b083f27e3d751ccec258880ae7676e9af959a63 Gerrit-Change-Number: 10884 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:16 +0000 Subject: Change in libosmocore[master]: logging vty: write: check logging levels validity Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10887 Change subject: logging vty: write: check logging levels validity ...................................................................... logging vty: write: check logging levels validity Change-Id: If683b1272ad2d5b402b91c52c496aa7975bc6315 --- M src/vty/logging_vty.c 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/10887/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index d0a9421..1f5cf2a 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -861,21 +861,35 @@ get_value_string(logging_print_file_args, tgt->print_filename2), VTY_NEWLINE); - if (tgt->loglevel) - vty_out(vty, " logging level all %s%s", - get_value_string(loglevel_strs_lower, tgt->loglevel), - VTY_NEWLINE); + if (tgt->loglevel) { + const char *level_str = get_value_string_or_null(loglevel_strs_lower, tgt->loglevel); + if (!level_str) + vty_out(vty, "%% Invalid log level %u for 'all'%s", tgt->loglevel, VTY_NEWLINE); + else + vty_out(vty, " logging level all %s%s", level_str, VTY_NEWLINE); + } for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; + const char *cat_name; + const char *level_str; /* skip empty entries in the array */ if (!osmo_log_info->cat[i].name) continue; - /* stupid old osmo logging API uses uppercase strings... */ - vty_out(vty, " logging level %s", osmo_str_tolower(osmo_log_info->cat[i].name+1)); - vty_out(vty, " %s%s", get_value_string(loglevel_strs_lower, cat->loglevel), VTY_NEWLINE); + /* Note: cat_name references the static buffer returned by osmo_str_tolower(), will + * become invalid after next osmo_str_tolower() invocation. */ + cat_name = osmo_str_tolower(osmo_log_info->cat[i].name+1); + + level_str = get_value_string_or_null(loglevel_strs_lower, cat->loglevel); + if (!level_str) { + vty_out(vty, "%% Invalid log level %u for %s%s", cat->loglevel, cat_name, + VTY_NEWLINE); + continue; + } + + vty_out(vty, " logging level %s %s%s", cat_name, level_str, VTY_NEWLINE); } return 1; -- To view, visit https://gerrit.osmocom.org/10887 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: If683b1272ad2d5b402b91c52c496aa7975bc6315 Gerrit-Change-Number: 10887 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:16 +0000 Subject: Change in libosmocore[master]: logging: define lower-case loglevel value_string[] Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10886 Change subject: logging: define lower-case loglevel value_string[] ...................................................................... logging: define lower-case loglevel value_string[] Instead of constantly converting logging level strings to lowercase representation during VTY interaction, just define loglevel_strs_lower[] and use those. I'm not defining a log_level_str_lower() function to wrap get_value_string(), because I already know that a later patch will switch to using get_value_string_or_null(). Change-Id: Ie55d732281bdf74324e1dd7f8a2ba91d11409851 --- M include/osmocom/core/logging_internal.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/10886/1 diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 55b1bbd..96b80a3 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -9,6 +9,8 @@ extern void *tall_log_ctx; extern const struct log_info *osmo_log_info; +extern const struct value_string loglevel_strs_lower[]; + void assert_loginfo(const char *src); /*! @} */ diff --git a/src/logging.c b/src/logging.c index 67470a5..159838c 100644 --- a/src/logging.c +++ b/src/logging.c @@ -72,6 +72,16 @@ { 0, NULL }, }; +/*! human readable string for each log level, lower case */ +const struct value_string loglevel_strs_lower[] = { + { LOGL_DEBUG, "debug" }, + { LOGL_INFO, "info" }, + { LOGL_NOTICE, "notice" }, + { LOGL_ERROR, "error" }, + { LOGL_FATAL, "fatal" }, + { 0, NULL }, +}; + #define INT2IDX(x) (-1*(x)-1) static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = { [INT2IDX(DLGLOBAL)] = { /* -1 becomes 0 */ diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 6758dd2..d0a9421 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -861,9 +861,9 @@ get_value_string(logging_print_file_args, tgt->print_filename2), VTY_NEWLINE); - /* stupid old osmo logging API uses uppercase strings... */ if (tgt->loglevel) - vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), + vty_out(vty, " logging level all %s%s", + get_value_string(loglevel_strs_lower, tgt->loglevel), VTY_NEWLINE); for (i = 0; i < osmo_log_info->num_cat; i++) { @@ -875,7 +875,7 @@ /* stupid old osmo logging API uses uppercase strings... */ vty_out(vty, " logging level %s", osmo_str_tolower(osmo_log_info->cat[i].name+1)); - vty_out(vty, " %s%s", osmo_str_tolower(log_level_str(cat->loglevel)), VTY_NEWLINE); + vty_out(vty, " %s%s", get_value_string(loglevel_strs_lower, cat->loglevel), VTY_NEWLINE); } return 1; -- To view, visit https://gerrit.osmocom.org/10886 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: Ie55d732281bdf74324e1dd7f8a2ba91d11409851 Gerrit-Change-Number: 10886 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:16 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate the 'everything' keyword Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10885 Change subject: logging vty: deprecate the 'everything' keyword ...................................................................... logging vty: deprecate the 'everything' keyword The 'logging level all everything' has not had an effect for some time now. The plan is to bring back its old functionality, but to keep it deprecated and rather define a less confusing name. * Deprecate 'everything'. * Do not write 'everything' during 'write file' or 'show running-config', which we curiously still do until now. BTW, the reason why we need to compose a complete list of categories for the deprecated 'everything' command is explained in detail in the commit log for I3b083f27e3d751ccec258880ae7676e9af959a63 Change-Id: Ib75fedb0572570a61bb34ee729a2af86cf5f16da --- M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 3 files changed, 35 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10885/1 diff --git a/src/logging.c b/src/logging.c index 7c2d61f..67470a5 100644 --- a/src/logging.c +++ b/src/logging.c @@ -64,7 +64,6 @@ LLIST_HEAD(osmo_log_target_list); static const struct value_string loglevel_strs[] = { - { 0, "EVERYTHING" }, { LOGL_DEBUG, "DEBUG" }, { LOGL_INFO, "INFO" }, { LOGL_NOTICE, "NOTICE" }, diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 2b001bc..6758dd2 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -320,7 +320,7 @@ cmd->doc = doc_str; } -/* logging level (all|) (everything|debug|...|fatal) */ +/* logging level (all|) (debug|...|fatal) */ DEFUN(logging_level, logging_level_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -338,11 +338,6 @@ return CMD_WARNING; } - if (strcmp(argv[1], "everything") == 0) { /* FIXME: remove this check once 'everything' is phased out */ - vty_out(vty, "%% Ignoring deprecated logging level %s%s", argv[1], VTY_NEWLINE); - return CMD_SUCCESS; - } - /* Check for special case where we want to set global log level */ if (!strcmp(argv[0], "all")) { log_set_log_level(tgt, level); @@ -360,6 +355,15 @@ return CMD_SUCCESS; } +/* logging level (all|) everything */ +DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd, + NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ + NULL) /* same thing for helpstr. */ +{ + vty_out(vty, "%% Ignoring deprecated logging level 'everything' keyword%s", VTY_NEWLINE); + return CMD_SUCCESS; +} + DEFUN(logging_set_category_mask, logging_set_category_mask_cmd, "logging set-log-mask MASK", @@ -858,8 +862,9 @@ VTY_NEWLINE); /* stupid old osmo logging API uses uppercase strings... */ - vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), - VTY_NEWLINE); + if (tgt->loglevel) + vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), + VTY_NEWLINE); for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; @@ -896,7 +901,7 @@ { struct cmd_element *cmd = talloc_zero(ctx, struct cmd_element); OSMO_ASSERT(cmd); - cmd->string = talloc_asprintf(cmd, "logging level %s (everything|debug|info|notice|error|fatal)", + cmd->string = talloc_asprintf(cmd, "logging level %s (debug|info|notice|error|fatal)", name); printf("%s\n", cmd->string); cmd->func = log_deprecated_func; @@ -924,12 +929,16 @@ install_element_ve(&logging_set_category_mask_cmd); install_element_ve(&logging_set_category_mask_old_cmd); - /* logging level (all|) (everything|debug|...|fatal) */ + /* logging level (all|) (debug|...|fatal) */ gen_logging_level_cmd_strs(&logging_level_cmd, - "(everything|" LOG_LEVEL_ARGS ")", - EVERYTHING_STR LOG_LEVEL_STRS); + "(" LOG_LEVEL_ARGS ")", + LOG_LEVEL_STRS); + /* logging level (all|) everything */ + gen_logging_level_cmd_strs(&deprecated_logging_level_everything_cmd, + "everything", EVERYTHING_STR); install_element_ve(&logging_level_cmd); + install_element_ve(&deprecated_logging_level_everything_cmd); install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); @@ -943,6 +952,7 @@ install_element(CFG_LOG_NODE, &logging_prnt_level_cmd); install_element(CFG_LOG_NODE, &logging_prnt_file_cmd); install_element(CFG_LOG_NODE, &logging_level_cmd); + install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd); install_element(CONFIG_NODE, &cfg_log_stderr_cmd); install_element(CONFIG_NODE, &cfg_no_log_stderr_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index c57b70f..a2c1e74 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -1,11 +1,9 @@ logging_vty_test> enable -logging_vty_test# ! Note that 'logging level all everything' is still printed! logging_vty_test# show running-config ... log stderr -... - logging level all everything +... !logging level all logging level aa debug logging level bb info logging level ccc notice @@ -39,7 +37,7 @@ logging print level (0|1) logging print file (0|1|basename) [last] logging set-log-mask MASK - logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (everything|debug|info|notice|error|fatal) + logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) show logging vty ... !logging @@ -64,20 +62,18 @@ ... logging_vty_test# logging level aa ? - everything Don't use. It doesn't log anything - debug Log debug messages and higher levels - info Log informational messages and higher levels - notice Log noticeable messages and higher levels - error Log error messages and higher levels - fatal Log only fatal messages + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages logging_vty_test# logging level all ? - everything Don't use. It doesn't log anything - debug Log debug messages and higher levels - info Log informational messages and higher levels - notice Log noticeable messages and higher levels - error Log error messages and higher levels - fatal Log only fatal messages + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages logging_vty_test# log-sweep @@ -181,7 +177,7 @@ logging_vty_test# ! Old 'logging level all everything' has no effect logging_vty_test# logging level all everything -% Ignoring deprecated logging level everything +% Ignoring deprecated logging level 'everything' keyword logging_vty_test# log-sweep eee DEEE NOTICE Log message for DEEE on level LOGL_NOTICE DEEE ERROR Log message for DEEE on level LOGL_ERROR -- To view, visit https://gerrit.osmocom.org/10885 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: Ib75fedb0572570a61bb34ee729a2af86cf5f16da Gerrit-Change-Number: 10885 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:17 +0000 Subject: Change in libosmocore[master]: jenkins: add --enable-external-tests Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10890 Change subject: jenkins: add --enable-external-tests ...................................................................... jenkins: add --enable-external-tests Run the new logging_vty_test.vty VTY transcript test in our CI. Change-Id: Ic4ec1f6c131da50b3956f16f0b49375f387196b3 --- M contrib/jenkins_amd64.sh M contrib/jenkins_arm.sh 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/90/10890/1 diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh index c3af378..cd7b666 100755 --- a/contrib/jenkins_amd64.sh +++ b/contrib/jenkins_amd64.sh @@ -15,7 +15,8 @@ prep_build "$src_dir" "$build_dir" - "$src_dir"/configure --disable-silent-rules --enable-static $ENABLE_SANITIZE --enable-werror + "$src_dir"/configure --disable-silent-rules --enable-static $ENABLE_SANITIZE --enable-werror \ + --enable-external-tests run_make } diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh index 1d72f2f..e3a6cd1 100755 --- a/contrib/jenkins_arm.sh +++ b/contrib/jenkins_arm.sh @@ -18,6 +18,7 @@ --enable-embedded \ --disable-doxygen \ --disable-shared \ + --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs $WERROR_FLAGS" $MAKE $PARALLEL_MAKE -- To view, visit https://gerrit.osmocom.org/10890 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: Ic4ec1f6c131da50b3956f16f0b49375f387196b3 Gerrit-Change-Number: 10890 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:16 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate 'all', introduce 'force-all' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10888 Change subject: logging vty: deprecate 'all', introduce 'force-all' ...................................................................... logging vty: deprecate 'all', introduce 'force-all' Add 'logging level force-all ' and 'no logging level force-all' as new names for 'logging level all ' and 'logging level all everything'. Resurrect the functionality of 'logging level all everything' -- even if it is still deprecated because the name is confusing, it is now just an alias for 'no logging level force-all'. Show in logging_vty_test.vty that we can now again lift the global logging clamp, both with the new commands as well as with the deprecated ones. Also show that 'force-all' is written back properly, if set. Change-Id: I36f17c131cc70ce5a1aef62fd9693097de230cd4 --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 190 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/10888/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 1f5cf2a..0878e1f 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -43,9 +43,15 @@ #define LOG_STR "Configure logging sub-system\n" #define LEVEL_STR "Set the log level for a specified category\n" -#define CATEGORY_ALL_STR "Global setting for all subsystems\n" +#define CATEGORY_ALL_STR "Deprecated alias for 'force-all'\n" +#define FORCE_ALL_STR \ + "Globally force all logging categories to a specific level. This is released by the" \ + " 'no logging level force-all' command. Note: any 'logging level '" \ + " commands will have no visible effect after this, until the forced level is released.\n" +#define NO_FORCE_ALL_STR \ + "Release any globally forced log level set with 'logging level force-all '\n" -#define LOG_LEVEL_ARGS "debug|info|notice|error|fatal" +#define LOG_LEVEL_ARGS "(debug|info|notice|error|fatal)" #define LOG_LEVEL_STRS \ "Log debug messages and higher levels\n" \ "Log informational messages and higher levels\n" \ @@ -53,7 +59,7 @@ "Log error messages and higher levels\n" \ "Log only fatal messages\n" -#define EVERYTHING_STR "Don't use. It doesn't log anything\n" +#define EVERYTHING_STR "Deprecated alias for 'no logging level force-all'\n" /*! \file logging_vty.c * Configuration of logging from VTY @@ -307,11 +313,10 @@ OSMO_ASSERT(cmd->string == NULL); OSMO_ASSERT(cmd->doc == NULL); - osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logging level (all|"); + osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logging level ("); osmo_talloc_asprintf(tall_log_ctx, doc_str, LOGGING_STR - LEVEL_STR - CATEGORY_ALL_STR); + LEVEL_STR); add_category_strings(&cmd_str, &doc_str, osmo_log_info); osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", level_args); osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", level_strs); @@ -320,7 +325,7 @@ cmd->doc = doc_str; } -/* logging level (all|) (debug|...|fatal) */ +/* logging level () (debug|...|fatal) */ DEFUN(logging_level, logging_level_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -338,12 +343,6 @@ return CMD_WARNING; } - /* Check for special case where we want to set global log level */ - if (!strcmp(argv[0], "all")) { - log_set_log_level(tgt, level); - return CMD_SUCCESS; - } - if (category < 0) { vty_out(vty, "Invalid category `%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -355,7 +354,7 @@ return CMD_SUCCESS; } -/* logging level (all|) everything */ +/* logging level () everything */ DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ NULL) /* same thing for helpstr. */ @@ -364,6 +363,35 @@ return CMD_SUCCESS; } +DEFUN(logging_level_force_all, logging_level_force_all_cmd, + "logging level force-all " LOG_LEVEL_ARGS, + LOGGING_STR LEVEL_STR FORCE_ALL_STR LOG_LEVEL_STRS) +{ + struct log_target *tgt = osmo_log_vty2tgt(vty); + int level = log_parse_level(argv[0]); + log_set_log_level(tgt, level); + return CMD_SUCCESS; +} + +DEFUN(no_logging_level_force_all, no_logging_level_force_all_cmd, + "no logging level force-all", + NO_STR LOGGING_STR LEVEL_STR NO_FORCE_ALL_STR) +{ + struct log_target *tgt = osmo_log_vty2tgt(vty); + log_set_log_level(tgt, 0); + return CMD_SUCCESS; +} + +/* 'logging level all (debug|...|fatal)' */ +ALIAS_DEPRECATED(logging_level_force_all, deprecated_logging_level_all_cmd, + "logging level all " LOG_LEVEL_ARGS, + LOGGING_STR LEVEL_STR CATEGORY_ALL_STR LOG_LEVEL_STRS); + +/* 'logging level all everything' */ +ALIAS_DEPRECATED(no_logging_level_force_all, deprecated_logging_level_all_everything_cmd, + "logging level all everything", + LOGGING_STR LEVEL_STR CATEGORY_ALL_STR EVERYTHING_STR); + DEFUN(logging_set_category_mask, logging_set_category_mask_cmd, "logging set-log-mask MASK", @@ -864,9 +892,10 @@ if (tgt->loglevel) { const char *level_str = get_value_string_or_null(loglevel_strs_lower, tgt->loglevel); if (!level_str) - vty_out(vty, "%% Invalid log level %u for 'all'%s", tgt->loglevel, VTY_NEWLINE); + vty_out(vty, "%% Invalid log level %u for 'force-all'%s", + tgt->loglevel, VTY_NEWLINE); else - vty_out(vty, " logging level all %s%s", level_str, VTY_NEWLINE); + vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); } for (i = 0; i < osmo_log_info->num_cat; i++) { @@ -943,16 +972,20 @@ install_element_ve(&logging_set_category_mask_cmd); install_element_ve(&logging_set_category_mask_old_cmd); - /* logging level (all|) (debug|...|fatal) */ + /* logging level () (debug|...|fatal) */ gen_logging_level_cmd_strs(&logging_level_cmd, - "(" LOG_LEVEL_ARGS ")", + LOG_LEVEL_ARGS, LOG_LEVEL_STRS); - /* logging level (all|) everything */ + /* logging level () everything */ gen_logging_level_cmd_strs(&deprecated_logging_level_everything_cmd, "everything", EVERYTHING_STR); install_element_ve(&logging_level_cmd); + install_element_ve(&logging_level_force_all_cmd); + install_element_ve(&no_logging_level_force_all_cmd); install_element_ve(&deprecated_logging_level_everything_cmd); + install_element_ve(&deprecated_logging_level_all_cmd); + install_element_ve(&deprecated_logging_level_all_everything_cmd); install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); @@ -966,7 +999,11 @@ install_element(CFG_LOG_NODE, &logging_prnt_level_cmd); install_element(CFG_LOG_NODE, &logging_prnt_file_cmd); install_element(CFG_LOG_NODE, &logging_level_cmd); + install_element(CFG_LOG_NODE, &logging_level_force_all_cmd); + install_element(CFG_LOG_NODE, &no_logging_level_force_all_cmd); install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd); + install_element(CFG_LOG_NODE, &deprecated_logging_level_all_cmd); + install_element(CFG_LOG_NODE, &deprecated_logging_level_all_everything_cmd); install_element(CONFIG_NODE, &cfg_log_stderr_cmd); install_element(CONFIG_NODE, &cfg_no_log_stderr_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index a2c1e74..03b0c4a 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -12,6 +12,19 @@ ... logging_vty_test# configure terminal +logging_vty_test(config)# log stderr + +logging_vty_test(config-log)# logging level force-all notice +logging_vty_test(config-log)# show running-config +... !logging level all + logging level force-all notice +... !logging level all + +logging_vty_test(config-log)# no logging level force-all +logging_vty_test(config-log)# show running-config +... !logging level force-all + +logging_vty_test(config-log)# exit logging_vty_test(config)# no log stderr logging_vty_test(config)# exit @@ -37,9 +50,10 @@ logging print level (0|1) logging print file (0|1|basename) [last] logging set-log-mask MASK - logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) - show logging vty -... !logging + logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) + logging level force-all (debug|info|notice|error|fatal) + no logging level force-all +... !^ logging logging_vty_test# logging ? enable Enables logging to this vty @@ -52,14 +66,15 @@ level Set the log level for a specified category logging_vty_test# logging level ? - all Global setting for all subsystems - aa Antropomorphic Armadillos (AA) - bb Bidirectional Breadspread (BB) - ccc Chaos Communication Congress (CCC) - dddd Dehydrated Dribbling Duck Dunkers (DDDD) - eee Exhaustive Entropy Extraction (EEE) - lglobal Library-internal global log family -... +... ! all + aa Antropomorphic Armadillos (AA) + bb Bidirectional Breadspread (BB) + ccc Chaos Communication Congress (CCC) + dddd Dehydrated Dribbling Duck Dunkers (DDDD) + eee Exhaustive Entropy Extraction (EEE) + lglobal Library-internal global log family +... ! all + force-all Globally force all logging categories to a specific level. This is released by the 'no logging level force-all' command. Note: any 'logging level ' commands will have no visible effect after this, until the forced level is released. logging_vty_test# logging level aa ? debug Log debug messages and higher levels @@ -69,12 +84,18 @@ fatal Log only fatal messages logging_vty_test# logging level all ? +% There is no matched command. + +logging_vty_test# logging level force-all ? debug Log debug messages and higher levels info Log informational messages and higher levels notice Log noticeable messages and higher levels error Log error messages and higher levels fatal Log only fatal messages +logging_vty_test# no logging level ? + force-all Release any globally forced log level set with 'logging level force-all ' + logging_vty_test# log-sweep DAA DEBUG Log message for DAA on level LOGL_DEBUG @@ -93,6 +114,7 @@ DDDDD FATAL Log message for DDDDD on level LOGL_FATAL DEEE FATAL Log message for DEEE on level LOGL_FATAL +logging_vty_test# ! The deprecated 'logging level all' still does what it did logging_vty_test# logging level all fatal logging_vty_test# log-sweep DAA FATAL Log message for DAA on level LOGL_FATAL @@ -175,12 +197,110 @@ DEEE ERROR Log message for DEEE on level LOGL_ERROR DEEE FATAL Log message for DEEE on level LOGL_FATAL -logging_vty_test# ! Old 'logging level all everything' has no effect +logging_vty_test# ! Deprecated 'logging level all everything' lifts the globally forced level logging_vty_test# logging level all everything -% Ignoring deprecated logging level 'everything' keyword +logging_vty_test# log-sweep eee +DEEE FATAL Log message for DEEE on level LOGL_FATAL + + +logging_vty_test# ! Now do the same dance with the new 'logging level force-all' commands +logging_vty_test# logging level force-all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level force-all error +logging_vty_test# log-sweep +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level force-all notice +logging_vty_test# log-sweep +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level force-all debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB DEBUG Log message for DBB on level LOGL_DEBUG +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC DEBUG Log message for DCCC on level LOGL_DEBUG +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE DEBUG Log message for DEEE on level LOGL_DEBUG +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! 'force-all' overrides everything, be it stronger or weaker +logging_vty_test# logging level force-all notice +logging_vty_test# logging level eee debug logging_vty_test# log-sweep eee DEEE NOTICE Log message for DEEE on level LOGL_NOTICE DEEE ERROR Log message for DEEE on level LOGL_ERROR DEEE FATAL Log message for DEEE on level LOGL_FATAL -logging_vty_test# ! There is currently no way to remove the 'logging level all' level! +logging_vty_test# logging level force-all notice +logging_vty_test# logging level eee fatal +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! lift the globally forced level +logging_vty_test# no logging level force-all +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL -- To view, visit https://gerrit.osmocom.org/10888 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: I36f17c131cc70ce5a1aef62fd9693097de230cd4 Gerrit-Change-Number: 10888 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 01:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Sep 2018 01:50:17 +0000 Subject: Change in libosmocore[master]: logging vty: add 'logging level set-all ' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10889 Change subject: logging vty: add 'logging level set-all ' ...................................................................... logging vty: add 'logging level set-all ' Add new command to once-off set each and every category to the given log level, as discussed at length on the openbsc@ mailing list. Show that it works in logging_vty_test.vty. Change-Id: I4c3e4f786476cb813fdc0a7c64f30ee04758309d --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 185 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10889/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 0878e1f..1812da3 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -354,6 +354,28 @@ return CMD_SUCCESS; } +DEFUN(logging_level_set_all, logging_level_set_all_cmd, + "logging level set-all " LOG_LEVEL_ARGS, + LOGGING_STR LEVEL_STR + "Once-off set all categories to the given log level. There is no single command" + " to take back these changes -- each category is set to the given level, period.\n" + LOG_LEVEL_STRS) +{ + struct log_target *tgt = osmo_log_vty2tgt(vty); + int level = log_parse_level(argv[0]); + int i; + for (i = 0; i < osmo_log_info->num_cat; i++) { + struct log_category *cat = &tgt->categories[i]; + /* skip empty entries in the array */ + if (!osmo_log_info->cat[i].name) + continue; + + cat->enabled = 1; + cat->loglevel = level; + } + return CMD_SUCCESS; +} + /* logging level () everything */ DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -981,6 +1003,7 @@ "everything", EVERYTHING_STR); install_element_ve(&logging_level_cmd); + install_element_ve(&logging_level_set_all_cmd); install_element_ve(&logging_level_force_all_cmd); install_element_ve(&no_logging_level_force_all_cmd); install_element_ve(&deprecated_logging_level_everything_cmd); @@ -999,6 +1022,7 @@ install_element(CFG_LOG_NODE, &logging_prnt_level_cmd); install_element(CFG_LOG_NODE, &logging_prnt_file_cmd); install_element(CFG_LOG_NODE, &logging_level_cmd); + install_element(CFG_LOG_NODE, &logging_level_set_all_cmd); install_element(CFG_LOG_NODE, &logging_level_force_all_cmd); install_element(CFG_LOG_NODE, &no_logging_level_force_all_cmd); install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index 03b0c4a..0c552a5 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -51,6 +51,7 @@ logging print file (0|1|basename) [last] logging set-log-mask MASK logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) + logging level set-all (debug|info|notice|error|fatal) logging level force-all (debug|info|notice|error|fatal) no logging level force-all ... !^ logging @@ -74,6 +75,7 @@ eee Exhaustive Entropy Extraction (EEE) lglobal Library-internal global log family ... ! all + set-all Once-off set all categories to the given log level. There is no single command to take back these changes -- each category is set to the given level, period. force-all Globally force all logging categories to a specific level. This is released by the 'no logging level force-all' command. Note: any 'logging level ' commands will have no visible effect after this, until the forced level is released. logging_vty_test# logging level aa ? @@ -96,6 +98,13 @@ logging_vty_test# no logging level ? force-all Release any globally forced log level set with 'logging level force-all ' +logging_vty_test# logging level set-all ? + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + logging_vty_test# log-sweep DAA DEBUG Log message for DAA on level LOGL_DEBUG @@ -304,3 +313,155 @@ DDDDD ERROR Log message for DDDDD on level LOGL_ERROR DDDDD FATAL Log message for DDDDD on level LOGL_FATAL DEEE FATAL Log message for DEEE on level LOGL_FATAL + + +logging_vty_test# ! test 'set-all' +logging_vty_test# logging level set-all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all error +logging_vty_test# log-sweep +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all notice +logging_vty_test# log-sweep +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all info +logging_vty_test# log-sweep +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB DEBUG Log message for DBB on level LOGL_DEBUG +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC DEBUG Log message for DCCC on level LOGL_DEBUG +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE DEBUG Log message for DEEE on level LOGL_DEBUG +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level dddd error +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level ccc notice +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level bb info +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level aa debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL -- To view, visit https://gerrit.osmocom.org/10889 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: I4c3e4f786476cb813fdc0a7c64f30ee04758309d Gerrit-Change-Number: 10889 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 07:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:37:54 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/5844 ) Change subject: fix tests linking: don't use system installed libs ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 07:37: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 Sep 12 07:38:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:38:13 +0000 Subject: Change in gr-gsm[master]: Add .gitreview similar to the other osmocom's projects In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10882 ) Change subject: Add .gitreview similar to the other osmocom's projects ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10882 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: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4 Gerrit-Change-Number: 10882 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 07:38: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 Sep 12 07:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:38:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain AUTS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10767 ) Change subject: L3_Common: extend the AuthVector to contain AUTS ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Sep 2018 07:38: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 Sep 12 07:39:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:39:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain AUTS In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10767 ) Change subject: L3_Common: extend the AuthVector to contain AUTS ...................................................................... L3_Common: extend the AuthVector to contain AUTS AUTS is used in the UMTS AKA resync procedure. Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb --- M library/L3_Common.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn index bf7818a..57db6b3 100644 --- a/library/L3_Common.ttcn +++ b/library/L3_Common.ttcn @@ -11,7 +11,11 @@ OCT16 ik, OCT16 ck, OCT16 autn, - OCT8 res + OCT8 res, + /* auts is usally calculated from autn + rand on the MS. + * To simplify the test case, auts is generated instead calculated here. + */ + OCT14 auts } private function f_rnd_oct(integer len) return octetstring { @@ -37,6 +41,7 @@ vec.ck := f_rnd_oct(16); vec.autn := f_rnd_oct(16); vec.res := f_rnd_oct(8); + vec.auts := f_rnd_oct(14); return vec; } -- To view, visit https://gerrit.osmocom.org/10767 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: Id1afa47778e6220cab375ae4b54b251801724fdb Gerrit-Change-Number: 10767 Gerrit-PatchSet: 5 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 Wed Sep 12 07:39:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:39:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10768 ) Change subject: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC ...................................................................... GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC Match only on AKA RESYNC packages Change-Id: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 --- M library/GSUP_Types.ttcn 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index ba8180f..0d21404 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -299,6 +299,17 @@ template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi); +template GSUP_PDU tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC( + template hexstring imsi, + template octetstring auts, + template octetstring rand) := + tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_AUTS(auts), + tr_GSUP_IE_RAND(rand), + * + }); + template (value) GSUP_PDU ts_GSUP_SAI_RES(hexstring imsi, GSUP_IE auth_tuple) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), auth_tuple }); @@ -464,6 +475,14 @@ } } +template GSUP_IE tr_GSUP_IE_AUTS(template octetstring auts) := { + tag := OSMO_GSUP_AUTS_IE, + len := ?, + val := { + auts := auts + } +} + template (value) GSUP_IE ts_GSUP_IE_RAND(octetstring rand) := { tag := OSMO_GSUP_RAND_IE, len := 0, /* overwritten */ @@ -472,6 +491,14 @@ } } +template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand) := { + tag := OSMO_GSUP_RAND_IE, + len := ?, + val := { + rand := rand + } +} + template (value) GSUP_IE ts_GSUP_IE_SRES(octetstring sres) := { tag := OSMO_GSUP_SRES_IE, len := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/10768 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: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7 Gerrit-Change-Number: 10768 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 Wed Sep 12 07:41:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:41:07 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10831 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: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 07: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 Wed Sep 12 07:41:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:41:32 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10880 ) Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10880 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: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Wed, 12 Sep 2018 07:41: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 Sep 12 07:41:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 07:41:51 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 07:41: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 Sep 12 08:01:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:01:40 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/5844 ) Change subject: fix tests linking: don't use system installed libs ...................................................................... Patch Set 6: Hi Neels, > Vadim, I don't understand why you can't reproduce this problem, Well, does anyone else experience this problem too? > maybe your installed libraries are simply not in the LD_LIBRARY_PATH? My LD_LIBRARY_PATH is empty, all libraries are installed to the default '/usr/local/lib/' location, that is configured for most Debian based distributions in '/etc/ld.so.conf.d/libc.conf'. I just even tried to explicitly set LD_LIBRARY_PATH to '/usr/local/lib/', but the result is the same, not matching your output: $ for l in $(find . -name "*.so") ; do echo; echo "$l"; ldd $l | grep libosmo; done ./src/coding/.libs/libosmocoding.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f8fac718000) libosmogsm.so.10 => /opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x00007f8fac4bf000) libosmocodec.so.0 => /opt/osmocom/libosmocore/src/codec/.libs/libosmocodec.so.0 (0x00007f8fac2bb000) ./src/sim/.libs/libosmosim.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f0439542000) libosmogsm.so.10 => /opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x00007f04392e9000) ./src/.libs/libosmocore.so ./src/gsm/.libs/libosmogsm.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f68f8339000) ./src/gb/.libs/libosmogb.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f2989c75000) libosmovty.so.4 => /opt/osmocom/libosmocore/src/vty/.libs/libosmovty.so.4 (0x00007f2989a55000) libosmogsm.so.10 => /opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x00007f29897fc000) ./src/vty/.libs/libosmovty.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f064ba63000) ./src/codec/.libs/libosmocodec.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f9731650000) ./src/ctrl/.libs/libosmoctrl.so libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007f187bd94000) libosmogsm.so.10 => /opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x00007f187bb3b000) libosmovty.so.4 => /opt/osmocom/libosmocore/src/vty/.libs/libosmovty.so.4 (0x00007f187b91b000) where '/opt/osmocom/libosmocore/' is exactly the build directory... -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08:01: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 Sep 12 08:09:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:09:38 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/5844 ) Change subject: fix tests linking: don't use system installed libs ...................................................................... Patch Set 6: Doing the following: > $ cd libosmocore/tests/ > $ ldd gb/.libs/bssgp_fc_test | grep osmo results in the following: > libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fd995723000) > libosmogb.so.6 => /usr/local/lib/libosmogb.so.6 (0x00007fd9952fb000) > libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007fd994b0e000) > libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007fd9948b5000) but there is also an 'lt-*' version, so: > $ ldd gb/.libs/lt-bssgp_fc_test | grep osmo results in: > libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x00007fab7bd22000) > libosmogb.so.6 => /opt/osmocom/libosmocore/src/gb/.libs/libosmogb.so.6 (0x00007fab7b8fa000) > libosmovty.so.4 => /opt/osmocom/libosmocore/src/vty/.libs/libosmovty.so.4 (0x00007fab7b10d000) > libosmogsm.so.10 => /opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x00007fab7aeb4000) -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08:09:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 08:11:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:11:33 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/5844 ) Change subject: fix tests linking: don't use system installed libs ...................................................................... Patch Set 6: So, let's try to figure out the reason of this strange behavior first, before merging this change? -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08:11:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 08:16:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:16:15 +0000 Subject: Change in libosmocore[master]: logging vty: add VTY transcript test In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10883 ) Change subject: logging vty: add VTY transcript test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10883 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: I948e832a33131f8eab98651d6010ceb0ccbc9a9c Gerrit-Change-Number: 10883 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08:16: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 Sep 12 08:23:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:23:37 +0000 Subject: Change in libosmocore[master]: logging: define lower-case loglevel value_string[] In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10886 ) Change subject: logging: define lower-case loglevel value_string[] ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10886 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: Ie55d732281bdf74324e1dd7f8a2ba91d11409851 Gerrit-Change-Number: 10886 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08:23: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 Sep 12 08:30:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:30:23 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate 'all', introduce 'force-all' In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10888 ) Change subject: logging vty: deprecate 'all', introduce 'force-all' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10888 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: I36f17c131cc70ce5a1aef62fd9693097de230cd4 Gerrit-Change-Number: 10888 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08:30: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 Sep 12 08:32:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 08:32:12 +0000 Subject: Change in libosmocore[master]: logging vty: add 'logging level set-all ' In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10889 ) Change subject: logging vty: add 'logging level set-all ' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10889 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: I4c3e4f786476cb813fdc0a7c64f30ee04758309d Gerrit-Change-Number: 10889 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 08: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 Wed Sep 12 10:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 10:09:21 +0000 Subject: Change in gr-gsm[master]: Add .gitreview similar to the other osmocom's projects In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10882 ) Change subject: Add .gitreview similar to the other osmocom's projects ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10882 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: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4 Gerrit-Change-Number: 10882 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 10:09: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 Sep 12 10:14:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 10:14:26 +0000 Subject: Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10881 ) Change subject: burst_file_source: Fix reading longer bursts ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc File lib/misc_utils/burst_file_source_impl.cc: https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc at 96 PS1, Line 96: ws https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py File python/qa_burst_file_source.py: https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py at 1 PS1, Line 1: #!/usr/bin/env python Would this script work with both Python 2 and 3? If no, it makes sense to specify the version explicitly: #!/usr/bin/env python2 -- To view, visit https://gerrit.osmocom.org/10881 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: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 10:14:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 11:02:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Wed, 12 Sep 2018 11:02:03 +0000 Subject: Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts In-Reply-To: References: Message-ID: Hello Piotr Krysik, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10881 to look at the new patch set (#2). Change subject: burst_file_source: Fix reading longer bursts ...................................................................... burst_file_source: Fix reading longer bursts - Read bursts with pmt::deserialize directly from the std::filebuf - Remove the unused unserialized variable - Add tests Since df978693 when the rx_time tags are present in the incomming stream the gsm receiver adds fm_time to the burst's PMT and the bursts that burst file sink writes becomes longer because of the additional field. The burst file source block was expecting all burst to be 147 bytes long and reading files with longer bursts was failing with an unhandled exception. terminate called after throwing an instance of 'pmt::exception' thread[thread-per-block[5]: ]: pmt_cdr: wrong_type : #f what(): pmt::deserialize: malformed input stream, tag value = : 115 Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc --- M lib/misc_utils/burst_file_source_impl.cc M lib/qa_utils/burst_source_impl.cc M python/CMakeLists.txt A python/qa_burst_file_source.py 4 files changed, 109 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/81/10881/2 -- To view, visit https://gerrit.osmocom.org/10881 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: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 11:08:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Wed, 12 Sep 2018 11:08:51 +0000 Subject: Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts In-Reply-To: References: Message-ID: Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/10881 ) Change subject: burst_file_source: Fix reading longer bursts ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc File lib/misc_utils/burst_file_source_impl.cc: https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc at 96 PS1, Line 96: d_input_file.close(); > ws Done https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py File python/qa_burst_file_source.py: https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py at 1 PS1, Line 1: #!/usr/bin/env python > Would this script work with both Python 2 and 3? [?] It should once the gnuradio supports python3. I prefer not to change this as all other python tests are like this and gr_modtool also generate new tests with python and not python2/3 -- To view, visit https://gerrit.osmocom.org/10881 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: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 11:08: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 Sep 12 12:13:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:13:10 +0000 Subject: Change in osmo-iuh[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10891 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-hnbgw.install D debian/osmo-hnbgw.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/91/10891/1 diff --git a/Makefile.am b/Makefile.am index 67445ee..2e59306 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,15 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 -SUBDIRS = src include doc +SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-ranap.pc EXTRA_DIST = asn1 .version README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index bb99dfb..559db39 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,22 @@ CFLAGS="$CFLAGS -Wall" CPPFLAGS="$CPPFLAGS -Wall" +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -98,4 +114,6 @@ include/osmocom/iuh/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile ) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..507be2d --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-hnbgw.service +systemdsystemunit_DATA = \ + osmo-hnbgw.service +endif diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install index e230915..bb70ad5 100644 --- a/debian/osmo-hnbgw.install +++ b/debian/osmo-hnbgw.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-hnbgw.service usr/bin/osmo-hnbgw usr/share/doc/osmo-iuh/examples/osmo-hnbgw.cfg diff --git a/debian/osmo-hnbgw.service b/debian/osmo-hnbgw.service deleted file mode 120000 index e69ea55..0000000 --- a/debian/osmo-hnbgw.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-hnbgw.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 9ebfdd0..6f20b3e 100755 --- a/debian/rules +++ b/debian/rules @@ -16,3 +16,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10891 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: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 Gerrit-Change-Number: 10891 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 Sep 12 12:13:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:13:37 +0000 Subject: Change in osmo-hlr[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10892 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-hlr.install D debian/osmo-hlr.service M debian/rules 7 files changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/10892/1 diff --git a/Makefile.am b/Makefile.am index 8e18167..210e499 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ src \ include \ sql \ + contrib \ tests \ $(NULL) @@ -12,6 +13,9 @@ .version \ $(NULL) +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-gsup-client.pc diff --git a/configure.ac b/configure.ac index 16c8b51..368f1cc 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -103,6 +119,8 @@ include/Makefile libosmo-gsup-client.pc sql/Makefile + contrib/Makefile + contrib/systemd/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..520e720 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-hlr.service +systemdsystemunit_DATA = \ + osmo-hlr.service +endif diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 7991522..5a7c37b 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -1,3 +1,4 @@ +/lib/systemd/system/osmo-hlr.service /usr/bin/osmo-hlr /usr/bin/osmo-hlr-db-tool /usr/share/doc/osmo-hlr/sql/hlr.sql diff --git a/debian/osmo-hlr.service b/debian/osmo-hlr.service deleted file mode 120000 index 184f5aa..0000000 --- a/debian/osmo-hlr.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-hlr.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 1d8d8ab..9e97c6c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,3 +15,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10892 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: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694 Gerrit-Change-Number: 10892 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 Sep 12 12:14:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:14:10 +0000 Subject: Change in osmo-ggsn[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10893 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am R contrib/systemd/osmo-ggsn.service M debian/osmo-ggsn.install D debian/osmo-ggsn.service M debian/rules 8 files changed, 35 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/93/10893/1 diff --git a/Makefile.am b/Makefile.am index f9849c0..be378be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = lib gtp ggsn sgsnemu doc tests +SUBDIRS = lib gtp ggsn sgsnemu doc contrib tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgtp.pc @@ -12,4 +12,7 @@ EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ diff --git a/configure.ac b/configure.ac index 62812ae..bfa1364 100644 --- a/configure.ac +++ b/configure.ac @@ -38,9 +38,9 @@ case "${host}" in - i*86-*-linux-gnu*) + i*86-*-linux-gnu*) EXEC_LDADD="" ;; - *solaris*) + *solaris*) EXEC_LDADD="-lresolv -lsocket -lnsl" ;; esac @@ -126,7 +126,7 @@ # Checks for library functions. AC_PROG_GCC_TRADITIONAL # AC_FUNC_MALLOC -# AC_FUNC_MEMCMP +# AC_FUNC_MEMCMP AC_CHECK_FUNCS([gethostbyname inet_ntoa memset select socket strdup strerror strtol]) AC_CHECK_FUNCS(inet_aton inet_addr, break) @@ -169,6 +169,22 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -181,6 +197,8 @@ intl/Makefile po/Makefile sgsnemu/Makefile + contrib/Makefile + contrib/systemd/Makefile tests/Makefile tests/lib/Makefile tests/gtp/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..e6ad299 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-ggsn.service +systemdsystemunit_DATA = \ + osmo-ggsn.service +endif diff --git a/contrib/osmo-ggsn.service b/contrib/systemd/osmo-ggsn.service similarity index 100% rename from contrib/osmo-ggsn.service rename to contrib/systemd/osmo-ggsn.service diff --git a/debian/osmo-ggsn.install b/debian/osmo-ggsn.install index 522a3d1..17caef7 100644 --- a/debian/osmo-ggsn.install +++ b/debian/osmo-ggsn.install @@ -1,3 +1,4 @@ +/lib/systemd/system/osmo-ggsn.service /usr/bin/osmo-ggsn /usr/bin/sgsnemu /usr/share/man/man8/* diff --git a/debian/osmo-ggsn.service b/debian/osmo-ggsn.service deleted file mode 120000 index 3bc7d3d..0000000 --- a/debian/osmo-ggsn.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/osmo-ggsn.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 5db7886..fa087ed 100755 --- a/debian/rules +++ b/debian/rules @@ -17,3 +17,6 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg dh_strip -plibgtp3 --dbg-package=libgtp-dbg + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10893 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: I563559f5b501eded44efafc60bb0c9ffdea20b3e Gerrit-Change-Number: 10893 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 Sep 12 12:14:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:14:29 +0000 Subject: Change in osmo-sgsn[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10894 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I103bf3468d53578045593eac31b61f7e0248495e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-gbproxy.install D debian/osmo-gbproxy.service M debian/osmo-gtphub.install D debian/osmo-gtphub.service M debian/osmo-sgsn.install D debian/osmo-sgsn.service M debian/rules 11 files changed, 37 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/10894/1 diff --git a/Makefile.am b/Makefile.am index 38fdcba..1883ab5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,6 +12,7 @@ doc \ include \ src \ + contrib \ tests \ $(NULL) @@ -21,6 +22,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index c233fa3..73b6dce 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -201,4 +217,6 @@ tests/v42bis/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..b644f34 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,9 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = \ + osmo-gbproxy.service \ + osmo-gtphub.service \ + osmo-sgsn.service + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif diff --git a/debian/osmo-gbproxy.install b/debian/osmo-gbproxy.install index 8272551..9c7fb77 100644 --- a/debian/osmo-gbproxy.install +++ b/debian/osmo-gbproxy.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-gbproxy.service usr/bin/osmo-gbproxy usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg usr/share/doc/osmo-gbproxy/examples usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy.cfg usr/share/doc/osmo-gbproxy/examples diff --git a/debian/osmo-gbproxy.service b/debian/osmo-gbproxy.service deleted file mode 120000 index d23c649..0000000 --- a/debian/osmo-gbproxy.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-gbproxy.service \ No newline at end of file diff --git a/debian/osmo-gtphub.install b/debian/osmo-gtphub.install index ed0bd1b..568caaf 100644 --- a/debian/osmo-gtphub.install +++ b/debian/osmo-gtphub.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-gtphub.service usr/bin/osmo-gtphub usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg usr/share/doc/osmo-gtphub/examples usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub.cfg usr/share/doc/osmo-gtphub/examples diff --git a/debian/osmo-gtphub.service b/debian/osmo-gtphub.service deleted file mode 120000 index 81a0eb4..0000000 --- a/debian/osmo-gtphub.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-gtphub.service \ No newline at end of file diff --git a/debian/osmo-sgsn.install b/debian/osmo-sgsn.install index 9390deb..9d603f9 100644 --- a/debian/osmo-sgsn.install +++ b/debian/osmo-sgsn.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-sgsn.service usr/bin/osmo-sgsn usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg usr/share/doc/osmo-sgsn/examples usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg usr/share/doc/osmo-sgsn/examples diff --git a/debian/osmo-sgsn.service b/debian/osmo-sgsn.service deleted file mode 120000 index de22d90..0000000 --- a/debian/osmo-sgsn.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-sgsn.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 58ea9bb..e4b3d80 100755 --- a/debian/rules +++ b/debian/rules @@ -42,11 +42,11 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf # debmake generated override targets # Set options for ./configure -CONFIGURE_FLAGS += --enable-iu +CONFIGURE_FLAGS += --enable-iu --with-systemdsystemunitdir=/lib/systemd/system override_dh_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10894 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: I103bf3468d53578045593eac31b61f7e0248495e Gerrit-Change-Number: 10894 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 Sep 12 12:15:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:15:07 +0000 Subject: Change in osmo-mgw[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10895 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c --- M Makefile.am M configure.ac M contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-mgw.install D debian/osmo-mgw.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/10895/1 diff --git a/Makefile.am b/Makefile.am index 3270e4f..1497f80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 9f021df..3e6581d 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -151,4 +167,5 @@ doc/Makefile doc/examples/Makefile contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index db6d0f5..ab410c7 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1 +1,3 @@ +SUBDIRS = systemd + EXTRA_DIST = ipa.py diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..c0d95ff --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-mgw.service +systemdsystemunit_DATA = \ + osmo-mgw.service +endif diff --git a/debian/osmo-mgw.install b/debian/osmo-mgw.install index 39f7c01..ad3d3c6 100644 --- a/debian/osmo-mgw.install +++ b/debian/osmo-mgw.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-mgw.service usr/bin/osmo-mgw usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg diff --git a/debian/osmo-mgw.service b/debian/osmo-mgw.service deleted file mode 120000 index 1e0664c..0000000 --- a/debian/osmo-mgw.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-mgw.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index d13e426..d67243c 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf # debmake generated override targets # Set options for ./configure @@ -29,4 +29,7 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system + # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg -- To view, visit https://gerrit.osmocom.org/10895 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: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c Gerrit-Change-Number: 10895 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 Sep 12 12:15:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:15:34 +0000 Subject: Change in osmo-msc[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10896 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-msc.install D debian/osmo-msc.service M debian/rules 7 files changed, 31 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/10896/1 diff --git a/Makefile.am b/Makefile.am index 2f0a786..9f3644f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,12 +12,16 @@ doc \ include \ src \ + contrib \ tests \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 03acc0c..2d8dc42 100644 --- a/configure.ac +++ b/configure.ac @@ -181,6 +181,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -203,4 +219,6 @@ tests/msc_vlr/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..8648172 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-msc.service +systemdsystemunit_DATA = \ + osmo-msc.service +endif diff --git a/debian/osmo-msc.install b/debian/osmo-msc.install index 6b84b8f..1e7f22f 100644 --- a/debian/osmo-msc.install +++ b/debian/osmo-msc.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-msc.service usr/bin/osmo-msc usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc.cfg usr/share/doc/osmo-msc/examples usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc_custom-sccp.cfg usr/share/doc/osmo-msc/examples diff --git a/debian/osmo-msc.service b/debian/osmo-msc.service deleted file mode 120000 index 784b8b5..0000000 --- a/debian/osmo-msc.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-msc.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 15e79da..1cf3a35 100755 --- a/debian/rules +++ b/debian/rules @@ -42,11 +42,11 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf # debmake generated override targets # Set options for ./configure -CONFIGURE_FLAGS += --enable-iu --enable-smpp +CONFIGURE_FLAGS += --enable-iu --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10896 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: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594 Gerrit-Change-Number: 10896 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 Sep 12 12:16:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:16:36 +0000 Subject: Change in osmo-bsc[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10897 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-bsc.install D debian/osmo-bsc.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/10897/1 diff --git a/Makefile.am b/Makefile.am index 2f0a786..60a5b4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,11 +13,15 @@ include \ src \ tests \ + contrib \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 54d6a83..c6fa9a1 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -183,4 +199,6 @@ tests/handover/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..5119adf --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-bsc.service +systemdsystemunit_DATA = \ + osmo-bsc.service +endif diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 5dc1e0f..651ddb3 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bsc.service usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg usr/share/doc/osmo-bsc/examples diff --git a/debian/osmo-bsc.service b/debian/osmo-bsc.service deleted file mode 120000 index ce03af1..0000000 --- a/debian/osmo-bsc.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 71ffbf1..ffc99db 100755 --- a/debian/rules +++ b/debian/rules @@ -42,8 +42,10 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10897 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: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 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 Sep 12 12:16:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:16:56 +0000 Subject: Change in osmo-bts[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10898 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I87299134696bbfc6721b1226d4de6c73854aa846 --- M Makefile.am M configure.ac A contrib/Makefile.am D contrib/sysmobts.service A contrib/systemd/Makefile.am R contrib/systemd/lc15bts-mgr.service R contrib/systemd/osmo-bts-lc15.service R contrib/systemd/osmo-bts-sysmo.service R contrib/systemd/sysmobts-mgr.service M debian/osmo-bts-trx.install D debian/osmo-bts-trx.service M debian/osmo-bts-virtual.install D debian/osmo-bts-virtual.service M debian/rules 14 files changed, 45 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/10898/1 diff --git a/Makefile.am b/Makefile.am index 10ff2d2..b573aa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,11 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src tests doc +SUBDIRS = include src tests doc contrib # package the contrib and doc EXTRA_DIST = \ - contrib/dump_docs.py contrib/screenrc-l1fwd contrib/osmo-bts-sysmo.service \ + contrib/dump_docs.py contrib/screenrc-l1fwd \ contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \ doc/examples/sysmo/osmo-bts.cfg \ doc/examples/sysmo/sysmobts-mgr.cfg \ @@ -14,6 +14,9 @@ git-version-gen .version \ README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index aad55db..38e6713 100644 --- a/configure.ac +++ b/configure.ac @@ -279,6 +279,22 @@ CPPFLAGS=$oldCPPFLAGS fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -307,4 +323,6 @@ tests/meas/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/sysmobts.service b/contrib/sysmobts.service deleted file mode 100644 index 64e0127..0000000 --- a/contrib/sysmobts.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=sysmocom sysmoBTS - -[Service] -Type=simple -ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' -ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M -ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' -ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s' -Restart=always -RestartSec=2 -RestartPreventExitStatus=1 - -# The msg queues must be read fast enough -CPUSchedulingPolicy=rr -CPUSchedulingPriority=1 - -[Install] -WantedBy=multi-user.target -Alias=osmo-bts-sysmo.service diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..1646308 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,18 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = osmo-bts-virtual.service + +if ENABLE_SYSMOBTS +SYSTEMD_SERVICES += osmo-bts-sysmo.service sysmobts-mgr.service +endif + +if ENABLE_TRX +SYSTEMD_SERVICES += osmo-bts-trx.service +endif + +if ENABLE_LC15BTS +SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service +endif + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif # HAVE_SYSTEMD diff --git a/contrib/lc15bts-mgr.service b/contrib/systemd/lc15bts-mgr.service similarity index 100% rename from contrib/lc15bts-mgr.service rename to contrib/systemd/lc15bts-mgr.service diff --git a/contrib/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service similarity index 100% rename from contrib/osmo-bts-lc15.service rename to contrib/systemd/osmo-bts-lc15.service diff --git a/contrib/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service similarity index 100% rename from contrib/osmo-bts-sysmo.service rename to contrib/systemd/osmo-bts-sysmo.service diff --git a/contrib/sysmobts-mgr.service b/contrib/systemd/sysmobts-mgr.service similarity index 100% rename from contrib/sysmobts-mgr.service rename to contrib/systemd/sysmobts-mgr.service diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install index e821cb4..2343d25 100644 --- a/debian/osmo-bts-trx.install +++ b/debian/osmo-bts-trx.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bts-trx.service usr/bin/osmo-bts-trx usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg diff --git a/debian/osmo-bts-trx.service b/debian/osmo-bts-trx.service deleted file mode 120000 index 1abb0ce..0000000 --- a/debian/osmo-bts-trx.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bts-trx.service \ No newline at end of file diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install index 3815d7c..0e6ca1b 100644 --- a/debian/osmo-bts-virtual.install +++ b/debian/osmo-bts-virtual.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bts-virtual.service usr/bin/osmo-bts-virtual usr/bin/osmo-bts-omldummy usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg diff --git a/debian/osmo-bts-virtual.service b/debian/osmo-bts-virtual.service deleted file mode 120000 index 9a660b4..0000000 --- a/debian/osmo-bts-virtual.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bts-virtual.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index dcc8a11..27de11b 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg override_dh_auto_configure: - dh_auto_configure -- --enable-trx + dh_auto_configure -- --enable-trx --with-systemdsystemunitdir=/lib/systemd/system override_dh_clean: dh_clean -- To view, visit https://gerrit.osmocom.org/10898 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: I87299134696bbfc6721b1226d4de6c73854aa846 Gerrit-Change-Number: 10898 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 Sep 12 12:17:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:17:12 +0000 Subject: Change in osmo-pcu[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10899 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ie4c7e81495181059d1dff1c194d52d11fb72ed03 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am R contrib/systemd/osmo-pcu.service M debian/osmo-pcu.install D debian/osmo-pcu.service M debian/rules 8 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/99/10899/1 diff --git a/Makefile.am b/Makefile.am index 7a4e6c0..240e4ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,11 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src examples tests +SUBDIRS = include src examples tests contrib EXTRA_DIST = osmoappdesc.py README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 7288c24..90394e1 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,22 @@ STD_DEFINES_AND_INCLUDES="-Wall" AC_SUBST(STD_DEFINES_AND_INCLUDES) +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) @@ -168,4 +184,6 @@ src/Makefile examples/Makefile tests/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..f565234 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-pcu.service +systemdsystemunit_DATA = \ + osmo-pcu.service +endif diff --git a/contrib/osmo-pcu.service b/contrib/systemd/osmo-pcu.service similarity index 100% rename from contrib/osmo-pcu.service rename to contrib/systemd/osmo-pcu.service diff --git a/debian/osmo-pcu.install b/debian/osmo-pcu.install index 80316ee..1b82e96 100644 --- a/debian/osmo-pcu.install +++ b/debian/osmo-pcu.install @@ -1,4 +1,5 @@ etc/osmocom/osmo-pcu.cfg +lib/systemd/system/osmo-pcu.service usr/bin/osmo-pcu usr/include/osmocom/pcu/pcuif_proto.h usr/lib/*/pkgconfig/osmo-pcu.pc diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service deleted file mode 120000 index f077431..0000000 --- a/debian/osmo-pcu.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/osmo-pcu.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index cffb6ca..712dd75 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10899 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: Ie4c7e81495181059d1dff1c194d52d11fb72ed03 Gerrit-Change-Number: 10899 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 Sep 12 12:18:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:18:25 +0000 Subject: Change in osmo-trx[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10900 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ia1a4fb62dee35737ece1f3501f352501eba2449e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-trx-lms.install D debian/osmo-trx-lms.service M debian/osmo-trx-uhd.install D debian/osmo-trx-uhd.service M debian/osmo-trx-usrp1.install D debian/osmo-trx-usrp1.service M debian/patches/build-for-debian8.patch M debian/rules 12 files changed, 47 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/00/10900/1 diff --git a/Makefile.am b/Makefile.am index 8ab73a6..38cd88d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,7 @@ CommonLibs \ GSM \ Transceiver52M \ + contrib \ tests EXTRA_DIST = \ @@ -41,6 +42,9 @@ COPYING \ README +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + .PHONY: release @RELMAKE@ diff --git a/configure.ac b/configure.ac index daa8677..64e3b35 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,22 @@ AC_CHECK_HEADER([boost/config.hpp],[], [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) + # https://www.freedesktop.org/software/systemd/man/daemon.html + AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) + AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) + AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) + AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) @@ -247,6 +263,8 @@ tests/Transceiver52M/Makefile \ doc/Makefile \ doc/examples/Makefile \ + contrib/Makefile \ + contrib/systemd/Makefile \ ]) AC_OUTPUT diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..21fbb53 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,18 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = + +if DEVICE_UHD +SYSTEMD_SERVICES += osmo-trx-uhd.service +endif + +if DEVICE_USRP1 +SYSTEMD_SERVICES += osmo-trx-usrp1.service +endif + +if DEVICE_LMS +SYSTEMD_SERVICES += osmo-trx-lms.service +endif + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif # HAVE_SYSTEMD diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install index dd9d407..b58c862 100644 --- a/debian/osmo-trx-lms.install +++ b/debian/osmo-trx-lms.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-trx-lms.service /usr/bin/osmo-trx-lms /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/ diff --git a/debian/osmo-trx-lms.service b/debian/osmo-trx-lms.service deleted file mode 120000 index d2d697a..0000000 --- a/debian/osmo-trx-lms.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-trx-lms.service \ No newline at end of file diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install index 8944b13..b7ec5ca 100644 --- a/debian/osmo-trx-uhd.install +++ b/debian/osmo-trx-uhd.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-trx-uhd.service /usr/bin/osmo-trx-uhd /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/ /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/ diff --git a/debian/osmo-trx-uhd.service b/debian/osmo-trx-uhd.service deleted file mode 120000 index c67648f..0000000 --- a/debian/osmo-trx-uhd.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-trx-uhd.service \ No newline at end of file diff --git a/debian/osmo-trx-usrp1.install b/debian/osmo-trx-usrp1.install index c7e54b1..112a149 100644 --- a/debian/osmo-trx-usrp1.install +++ b/debian/osmo-trx-usrp1.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-trx-usrp1.service /usr/bin/osmo-trx-usrp1 /usr/share/usrp/rev2/std_inband.rbf /usr/share/usrp/rev4/std_inband.rbf diff --git a/debian/osmo-trx-usrp1.service b/debian/osmo-trx-usrp1.service deleted file mode 120000 index a7b33ad..0000000 --- a/debian/osmo-trx-usrp1.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-trx-usrp1.service \ No newline at end of file diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index d44eb2f..cd1f356 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -50,8 +50,8 @@ 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 +- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system ++ dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system override_dh_strip: dh_strip --dbg-package=osmo-trx-dbg diff --git a/debian/rules b/debian/rules index 8081162..68de706 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ 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 --with-lms --with-systemdsystemunitdir=/lib/systemd/system override_dh_strip: dh_strip --dbg-package=osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/10900 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: Ia1a4fb62dee35737ece1f3501f352501eba2449e Gerrit-Change-Number: 10900 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 Sep 12 12:18:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:18:45 +0000 Subject: Change in osmo-sip-connector[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10901 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I672f49f1034554ce62347ff9493eca18340deb3a --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-sip-connector.install D debian/osmo-sip-connector.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/01/10901/1 diff --git a/Makefile.am b/Makefile.am index 5a2c4a9..7c1e00c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,13 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = src tests +SUBDIRS = src tests contrib BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 916cfc3..1514faa 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) @@ -73,4 +89,6 @@ AC_OUTPUT( src/Makefile tests/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..213cc7a --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-sip-connector.service +systemdsystemunit_DATA = \ + osmo-sip-connector.service +endif diff --git a/debian/osmo-sip-connector.install b/debian/osmo-sip-connector.install index a16b95f..b776fda 100644 --- a/debian/osmo-sip-connector.install +++ b/debian/osmo-sip-connector.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-sip-connector.service usr/bin/osmo-sip-connector diff --git a/debian/osmo-sip-connector.service b/debian/osmo-sip-connector.service deleted file mode 120000 index c0ae1e1..0000000 --- a/debian/osmo-sip-connector.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-sip-connector.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 5e9e20f..e4e7ca9 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,6 @@ override_dh_strip: dh_strip --dbg-package=osmo-sip-connector-dbg + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10901 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: I672f49f1034554ce62347ff9493eca18340deb3a Gerrit-Change-Number: 10901 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 Sep 12 12:19:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:19:54 +0000 Subject: Change in openbsc[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10902 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 --- M debian/osmo-bsc-mgcp.install D debian/osmo-bsc-mgcp.service M debian/osmocom-bsc-nat.install D debian/osmocom-bsc-nat.service M debian/osmocom-bsc-sccplite.install D debian/osmocom-bsc-sccplite.service M debian/osmocom-nitb.install D debian/osmocom-nitb.service M openbsc/Makefile.am M openbsc/configure.ac A openbsc/contrib/Makefile.am A openbsc/contrib/systemd/Makefile.am D openbsc/debian/osmo-bsc-mgcp.service 13 files changed, 42 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/02/10902/1 diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install index 1550437..828fb31 100644 --- a/debian/osmo-bsc-mgcp.install +++ b/debian/osmo-bsc-mgcp.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-bsc-mgcp.service usr/bin/osmo-bsc_mgcp diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service deleted file mode 120000 index 0f8700b..0000000 --- a/debian/osmo-bsc-mgcp.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install index b561a7e..d6cabe2 100644 --- a/debian/osmocom-bsc-nat.install +++ b/debian/osmocom-bsc-nat.install @@ -1 +1,2 @@ +/lib/systemd/system/osmo-bsc-nat.service /usr/bin/osmo-bsc_nat diff --git a/debian/osmocom-bsc-nat.service b/debian/osmocom-bsc-nat.service deleted file mode 120000 index 0d5b3be..0000000 --- a/debian/osmocom-bsc-nat.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-bsc-nat.service \ No newline at end of file diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install index 9ce795c..67c50cb 100644 --- a/debian/osmocom-bsc-sccplite.install +++ b/debian/osmocom-bsc-sccplite.install @@ -1,2 +1,2 @@ -/usr/bin/osmo-bsc_mgcp +/lib/systemd/system/osmo-bsc-sccplite.service /usr/bin/osmo-bsc-sccplite diff --git a/debian/osmocom-bsc-sccplite.service b/debian/osmocom-bsc-sccplite.service deleted file mode 120000 index f30a9db..0000000 --- a/debian/osmocom-bsc-sccplite.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-bsc-sccplite.service \ No newline at end of file diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install index 26caf71..78e8f77 100644 --- a/debian/osmocom-nitb.install +++ b/debian/osmocom-nitb.install @@ -1,2 +1,3 @@ +/lib/systemd/system/osmo-nitb.service /usr/bin/osmo-nitb -openbsc/contrib/*.py usr/bin/ \ No newline at end of file +openbsc/contrib/*.py usr/bin/ diff --git a/debian/osmocom-nitb.service b/debian/osmocom-nitb.service deleted file mode 120000 index eaecd9d..0000000 --- a/debian/osmocom-nitb.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-nitb.service \ No newline at end of file diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index dc53929..792dcf2 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -13,6 +13,7 @@ include \ src \ tests \ + contrib \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig @@ -21,6 +22,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/openbsc/configure.ac b/openbsc/configure.ac index c3615d6..75dd5d3 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -220,6 +220,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -262,4 +278,6 @@ tests/nanobts_omlattr/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/openbsc/contrib/Makefile.am b/openbsc/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/openbsc/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/openbsc/contrib/systemd/Makefile.am b/openbsc/contrib/systemd/Makefile.am new file mode 100644 index 0000000..69f973e --- /dev/null +++ b/openbsc/contrib/systemd/Makefile.am @@ -0,0 +1,14 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = osmo-nitb.service osmo-bsc-mgcp.service + +if BUILD_NAT +SYSTEMD_SERVICES += osmo-bsc-nat.service +endif + +if BUILD_BSC +SYSTEMD_SERVICES += osmo-bsc-sccplite.service +endif + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif # HAVE_SYSTEMD diff --git a/openbsc/debian/osmo-bsc-mgcp.service b/openbsc/debian/osmo-bsc-mgcp.service deleted file mode 120000 index eb73b7b..0000000 --- a/openbsc/debian/osmo-bsc-mgcp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10902 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: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 Gerrit-Change-Number: 10902 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 Sep 12 12:47:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 12:47:22 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10903 Change subject: contrib: Disable installing unneeded systemd service files ...................................................................... contrib: Disable installing unneeded systemd service files Otherwise since we install without root perissins to a local directory, systemd files will fail to be installed to regular systemd location /lib/systemd/system/). Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477 --- M contrib/jenkins-build-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/03/10903/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index b8cafcf..731bf58 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -132,7 +132,7 @@ set +x; echo; echo; set -x autoreconf -fi set +x; echo; echo; set -x - ./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts + ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $CONFIGURE_FLAGS $configure_opts set +x; echo; echo; set -x make -j8 || make # libsmpp34 can't build in parallel set +x; echo; echo; set -x -- To view, visit https://gerrit.osmocom.org/10903 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: I20a285e4e92fec7990770568e8d5dc117d6bf477 Gerrit-Change-Number: 10903 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 Sep 12 13:49:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:49:30 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 12 Sep 2018 13:49:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 13:49:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:49:41 +0000 Subject: Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10871 ) Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots ...................................................................... ts,lchan_fsm: do not attempt to allocate CBCH subslots In case a given channel combination contains a CBCH, it replaces sub-slot 2 with a CBCH, i.e. we must not attempt to allocate the same for SDCCH. On timeslot initialization, immediately place such an lchan FSM into new state LCHAN_ST_CBCH, so that it never appears unused and never is picked during lchan_select(). Also set lchan->type = GSM_LCHAN_CBCH. Verified by configuring CBCH timeslots and watching 'show lchan summary'. Immediately after RSL and OML are up, these pchan types show lchan 2 in state CBCH: BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm With a 'phys_chan_config ccch+sdcch4+cbch' and three phones simultaneously requesting USSD, I see: BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 0, Type SDCCH, State ESTABLISHED - L1 MS Power: 14 dBm RXL-FULL-dl: -53 dBm RXL-FULL-ul: -47 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 1, Type SDCCH, State ESTABLISHED - L1 MS Power: 30 dBm RXL-FULL-dl: -47 dBm RXL-FULL-ul: -47 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 3, Type SDCCH, State ESTABLISHED - L1 MS Power: 16 dBm RXL-FULL-dl: -47 dBm RXL-FULL-ul: -47 dBm With 'phys_chan_config SDCCH8+CBCH' and three phones simultaneously attaching, I see: BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 0, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 1, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 3, Type SDCCH, State WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm i.e. in all cases the CBCH lchan remains occupied and is not allocated as SDCCH. Detaching and re-attaching the BTS reliably brings back the CBCH state. Also verified that changing the osmo-bsc config from telnet vty and dropping oml followed by the BTS re-attaching brings back the CBCH state. Change-Id: I2bafc5f696e818e38f8907ad0c8f38494df0623d --- M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index 35b8847..9fbf9b3 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -14,6 +14,7 @@ enum lchan_fsm_state { LCHAN_ST_UNUSED, + LCHAN_ST_CBCH, /*< Blocked by CBCH channel combination, not usable as SDCCH. */ LCHAN_ST_WAIT_TS_READY, LCHAN_ST_WAIT_ACTIV_ACK, /*< After RSL Chan Act Ack, lchan is active but RTP not configured. */ LCHAN_ST_WAIT_RLL_RTP_ESTABLISH, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 1ef7869..c80d8a1 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1035,6 +1035,13 @@ , .out_state_mask = 0 | S(LCHAN_ST_WAIT_TS_READY) + | S(LCHAN_ST_CBCH) + , + }, + [LCHAN_ST_CBCH] = { + .name = "CBCH", + .out_state_mask = 0 + | S(LCHAN_ST_UNUSED) , }, [LCHAN_ST_WAIT_TS_READY] = { diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 56b3357..fc25460 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -295,6 +295,15 @@ T_CHAN_ACT_DEACT); break; + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* For any pchans containing a CBCH, lchan[2] is reserved for CBCH and cannot be + * allocated for SDCCH. */ + OSMO_ASSERT(ts->lchan[2].fi); + ts->lchan[2].type = GSM_LCHAN_CBCH; + osmo_fsm_inst_state_chg(ts->lchan[2].fi, LCHAN_ST_CBCH, 0, 0); + break; + default: /* nothing to do */ break; -- To view, visit https://gerrit.osmocom.org/10871 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: I2bafc5f696e818e38f8907ad0c8f38494df0623d Gerrit-Change-Number: 10871 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 Sep 12 13:50:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:50:11 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10903 ) Change subject: contrib: Disable installing unneeded systemd service files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10903 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: I20a285e4e92fec7990770568e8d5dc117d6bf477 Gerrit-Change-Number: 10903 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 13:50:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 13:51:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:51:34 +0000 Subject: Change in openbsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10902 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10902 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: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 Gerrit-Change-Number: 10902 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 13:51: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 Sep 12 13:51:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:51:52 +0000 Subject: Change in osmo-sip-connector[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10901 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10901 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: I672f49f1034554ce62347ff9493eca18340deb3a Gerrit-Change-Number: 10901 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 13:51: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 Sep 12 13:52:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:52:29 +0000 Subject: Change in osmo-iuh[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10891 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10891 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: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 Gerrit-Change-Number: 10891 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 13:52: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 Sep 12 13:52:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:52:44 +0000 Subject: Change in osmo-ggsn[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10893 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10893 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: I563559f5b501eded44efafc60bb0c9ffdea20b3e Gerrit-Change-Number: 10893 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 13:52:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 13:54:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:54:41 +0000 Subject: Change in libosmocore[master]: logging vty: rewrite 'logging level' vty cmd generation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10884 ) Change subject: logging vty: rewrite 'logging level' vty cmd generation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10884 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: I3b083f27e3d751ccec258880ae7676e9af959a63 Gerrit-Change-Number: 10884 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Sep 2018 13:54: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 Sep 12 13:55:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:55:16 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate the 'everything' keyword In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10885 ) Change subject: logging vty: deprecate the 'everything' keyword ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10885 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: Ib75fedb0572570a61bb34ee729a2af86cf5f16da Gerrit-Change-Number: 10885 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Sep 2018 13:55: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 Sep 12 13:55:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:55:32 +0000 Subject: Change in libosmocore[master]: logging vty: write: check logging levels validity In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10887 ) Change subject: logging vty: write: check logging levels validity ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10887 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: If683b1272ad2d5b402b91c52c496aa7975bc6315 Gerrit-Change-Number: 10887 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Sep 2018 13:55: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 Sep 12 13:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:55:43 +0000 Subject: Change in libosmocore[master]: jenkins: add --enable-external-tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10890 ) Change subject: jenkins: add --enable-external-tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10890 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: Ic4ec1f6c131da50b3956f16f0b49375f387196b3 Gerrit-Change-Number: 10890 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Sep 2018 13:55: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 Sep 12 13:56:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:56:42 +0000 Subject: Change in libosmocore[master]: logging vty: add VTY transcript test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10883 ) Change subject: logging vty: add VTY transcript test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10883 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: I948e832a33131f8eab98651d6010ceb0ccbc9a9c Gerrit-Change-Number: 10883 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 13:56: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 Sep 12 13:58:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:58:50 +0000 Subject: Change in libosmocore[master]: logging: define lower-case loglevel value_string[] In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10886 ) Change subject: logging: define lower-case loglevel value_string[] ...................................................................... Patch Set 1: I don't really like that approach. The number of times when we "constantly" conver the strings is actually very low. I don't see any need for optimization at all. This doesn't seem to be something we do many times per second, or maybe even during logging of each log line - but only at the time somebody enters a VTY command that gets parsed. So I'd prefer to have that miniscule runtime overhead at rare occasions, than to have copy+paste of the table -- To view, visit https://gerrit.osmocom.org/10886 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: Ie55d732281bdf74324e1dd7f8a2ba91d11409851 Gerrit-Change-Number: 10886 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 12 Sep 2018 13:58:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 13:59:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Sep 2018 13:59:52 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate 'all', introduce 'force-all' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10888 ) Change subject: logging vty: deprecate 'all', introduce 'force-all' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10888 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: I36f17c131cc70ce5a1aef62fd9693097de230cd4 Gerrit-Change-Number: 10888 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 13:59: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 Sep 12 14:09:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 14:09:11 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10903 ) Change subject: contrib: Disable installing unneeded systemd service files ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10903 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: I20a285e4e92fec7990770568e8d5dc117d6bf477 Gerrit-Change-Number: 10903 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Sep 2018 14:09:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 14:09:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Sep 2018 14:09:12 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10903 ) Change subject: contrib: Disable installing unneeded systemd service files ...................................................................... contrib: Disable installing unneeded systemd service files Otherwise since we install without root perissins to a local directory, systemd files will fail to be installed to regular systemd location /lib/systemd/system/). Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477 --- M contrib/jenkins-build-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index b8cafcf..731bf58 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -132,7 +132,7 @@ set +x; echo; echo; set -x autoreconf -fi set +x; echo; echo; set -x - ./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts + ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $CONFIGURE_FLAGS $configure_opts set +x; echo; echo; set -x make -j8 || make # libsmpp34 can't build in parallel set +x; echo; echo; set -x -- To view, visit https://gerrit.osmocom.org/10903 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: I20a285e4e92fec7990770568e8d5dc117d6bf477 Gerrit-Change-Number: 10903 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 Sep 12 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Sep 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_#244?= In-Reply-To: <2143433111.69.1536678606427.JavaMail.jenkins@jenkins.osmocom.org> References: <2143433111.69.1536678606427.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1926533234.83.1536765006478.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_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_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_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_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 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 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 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_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 Sep 12 15:12:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:12:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10904 Change subject: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() ...................................................................... MSC_ConnectionHandler: stop properly on failure in f_establish_fully() When the altstep in f_establish_fully() gets an unexpected ASSIGNMENT FAIL or COMPLETE it should stop completely like it is already implemented in many other altsteps. Change-Id: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/10904/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 102c30e..9f67f1b 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -939,18 +939,28 @@ (not st.is_assignment and (st.modify_done or not exp_modify))) and exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE"); + all component.stop; + mtc.stop; } [exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { setverdict(fail, "Received unexpected ASSIGNMENT FAIL"); + all component.stop; + mtc.stop; } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { setverdict(fail, "Received unexpected ASSIGNMENT COMPLETE"); + all component.stop; + mtc.stop; } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { setverdict(fail, "Received non-matching ASSIGNMENT FAIL"); + all component.stop; + mtc.stop; } [] T.timeout { setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE"); + all component.stop; + mtc.stop; } } log("g_media ", g_media); -- To view, visit https://gerrit.osmocom.org/10904 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: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7 Gerrit-Change-Number: 10904 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 15:13:11 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:13:11 +0000 Subject: Change in osmo-bsc[master]: LCLS: use type and tch_mode from lchan to check codec Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10905 Change subject: LCLS: use type and tch_mode from lchan to check codec ...................................................................... LCLS: use type and tch_mode from lchan to check codec When not explicitly allowed via VTY settings, the LCLS mechanisms will avoid to locally switch connections with different codecs/rates. For example GSM HR and GSM FR would not be locally switched. At the moment osmo_bsc_lcls.c uses abandonned struct members to check if there is a codec mismatch, so a mismatch will never be detected. - Use struct memfffubers tch_mode and type from struct gsm_lchan *lchan instead of full_rate and chan_mode in struct gsm_subscriber_connection Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/10905/1 diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 6aeccb3..42bb5fa 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -274,15 +274,15 @@ return false; } - if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate + if (conn->lchan->type != conn->lcls.other->lchan->type && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel rate)\n"); + LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel type)\n"); return false; } - if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode + if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel mode)\n"); + LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (TCH-Mode)\n"); return false; } -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 15:13:12 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:13:12 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10906 Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... gsm_data: remove unused struct member full_rate. The struct member full_rate in struct gsm_subscriber_connection is not used anymore. Lets remove it. Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/10906/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index e408ff9..5a922d1 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -269,9 +269,6 @@ * (The BTS side CI is handled by struct gsm_lchan and the lchan_fsm.) */ struct mgwep_ci *mgw_endpoint_ci_msc; - /* Channel rate flag requested by the MSC, FR=1, HR=0, Invalid=-1 */ - int full_rate; - /* Channel mode requested by the MSC (signalling or voice channel) */ enum gsm48_chan_mode chan_mode; -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 15:13:12 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:13:12 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10907 Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... gsm_data: remove unused struct member chan_mode The struct member chan_mode in struct gsm_subscriber_connection is no longer used. There is only one VTY command that displays it along other parameters, but it is used no where else. Lets remove it. Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c 2 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/10907/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5a922d1..33a5a8d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -268,10 +268,6 @@ /* The connection identifier of the mgw_endpoint used to transceive RTP towards the MSC. * (The BTS side CI is handled by struct gsm_lchan and the lchan_fsm.) */ struct mgwep_ci *mgw_endpoint_ci_msc; - - /* Channel mode requested by the MSC (signalling or voice channel) */ - enum gsm48_chan_mode chan_mode; - } user_plane; /* LCLS (local call, local switch) related state */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b1938e6..d06ec57 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1472,9 +1472,8 @@ static void dump_one_subscr_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) { - vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mode=%s, mgw_ep=%s%s", + vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mgw_ep=%s%s", conn->sccp.conn_id, conn->sccp.msc->nr, conn->hodec2.failures, - get_value_string(gsm48_chan_mode_names, conn->user_plane.chan_mode), mgw_endpoint_name(conn->user_plane.mgw_endpoint), VTY_NEWLINE); if (conn->lcls.global_call_ref_len) { vty_out(vty, " LCLS GCR: %s%s", -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 15:31:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:31:32 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10814 ) Change subject: measurement: remove missed interval end detection ...................................................................... Patch Set 1: (1 comment) > (1 comment) > > BTW: why not to revert 4553890d? Unfortunately this is interlaced with other patches. It was easier just to remove the problematic sections using a regular patch. https://gerrit.osmocom.org/#/c/10814/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10814/1/src/common/measurement.c at 737 PS1, Line 737: uint32_t fn_missed_end; : bool missed_end; > Not needed anymore. Done -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 15:31: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 Sep 12 15:33:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:33:48 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10814 to look at the new patch set (#2). Change subject: measurement: remove missed interval end detection ...................................................................... measurement: remove missed interval end detection The function is_meas_overdue() was introduced to allow lchan_meas_process_measurement() to detect when the end of a measurement interval has been missed. Interval ends may be missed when the SACCH block of the related measurement interval gets lost. This is due to the fact that the SACCH block is used as a trigger to start the measurement result computation. The idea behind is_meas_overdue() was to check the frame number of the current measurement against the frame number of the previous measurement in order to see if there was a measurement for SACCH in between or not. Unfortunately SACCH and TCH Voice data is not necessarly processed in order by each phy. Depending on the phy there may be a jitter between the timing of SACCH and TCH Voice. Depending on the phy this jitter may be enough to mess up the timing so that we see a SACCH block earlier than expected. So we can not use the current frame number of TCH Voice measurements to check for missed SACCH blocks. Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Related: OS#3502 Related: OS#2975 --- 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, 2 insertions(+), 707 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/10814/2 -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 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 Sep 12 15:33:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:33:48 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix typo in comment Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10908 Change subject: cosmetic: fix typo in comment ...................................................................... cosmetic: fix typo in comment Change-Id: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10908/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 21ec16a..a296a8a 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -730,7 +730,7 @@ /* 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 + * measurement samples and automatically detects the end of the measurement * interval. */ int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { -- To view, visit https://gerrit.osmocom.org/10908 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: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c Gerrit-Change-Number: 10908 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 15:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:37:54 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10814 to look at the new patch set (#3). Change subject: measurement: remove missed interval end detection ...................................................................... measurement: remove missed interval end detection The function is_meas_overdue() was introduced to allow lchan_meas_process_measurement() to detect when the end of a measurement interval has been missed. Interval ends may be missed when the SACCH block of the related measurement interval gets lost. This is due to the fact that the SACCH block is used as a trigger to start the measurement result computation. The idea behind is_meas_overdue() was to check the frame number of the current measurement against the frame number of the previous measurement in order to see if there was a measurement for SACCH in between or not. Unfortunately SACCH and TCH Voice data is not necessarly processed in order by each phy. Depending on the phy there may be a jitter between the timing of SACCH and TCH Voice. Depending on the phy this jitter may be enough to mess up the timing so that we see a SACCH block earlier than expected. So we can not use the current frame number of TCH Voice measurements to check for missed SACCH blocks. Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Related: OS#3502 Related: OS#2975 --- 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, 2 insertions(+), 733 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/10814/3 -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 3 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 Sep 12 15:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:59:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn (bs_ag_blks_res) In-Reply-To: References: Message-ID: dexter 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: > 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. Thanks for the hint. I will keep this in mind for next time. -- 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-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Sep 2018 15:59:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 15:59:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Sep 2018 15:59:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn (bs_ag_blks_res) In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/10726 ) 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(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 67f302f..bfa8988 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: merged Gerrit-Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2 Gerrit-Change-Number: 10726 Gerrit-PatchSet: 3 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 Sep 12 16:23:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Wed, 12 Sep 2018 16:23:51 +0000 Subject: Change in gr-gsm[master]: grgsm_channelize: Add ichar data type Message-ID: Vasil Velichkov has uploaded this change for review. ( https://gerrit.osmocom.org/10909 Change subject: grgsm_channelize: Add ichar data type ...................................................................... grgsm_channelize: Add ichar data type This is the output format of rtl_sdr and hackrf_transfer and this would allow direct channelization without an additional post processing. Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8 --- M apps/helpers/grgsm_channelize 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/09/10909/1 diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize index 9b00bd7..5eaeb3b 100755 --- a/apps/helpers/grgsm_channelize +++ b/apps/helpers/grgsm_channelize @@ -79,6 +79,10 @@ self.blocks_file_source = blocks.file_source(gr.sizeof_short, input_file, False) self.source = blocks.interleaved_short_to_complex(False, False) self.connect((self.blocks_file_source, 0), (self.source, 0)) + elif data_type == "ichar": + self.blocks_file_source = blocks.file_source(gr.sizeof_char, input_file, False) + self.source = blocks.interleaved_char_to_complex(False) + self.connect((self.blocks_file_source, 0), (self.source, 0)) elif data_type == "complex": self.source = blocks.file_source(gr.sizeof_gr_complex, input_file, False) @@ -114,7 +118,7 @@ help="Sample rate of the output capture files [default=%(default)s]") parser.add_argument("-i", "--input_file", dest="input_file", type=str, required=True, help="Path to wideband GSM capture file") - parser.add_argument("-t", "--data_type", dest="data_type", type=str, choices=["complex","ishort"], default="complex", + parser.add_argument("-t", "--data_type", dest="data_type", type=str, choices=["complex","ishort","ichar"], default="complex", help="Type of the input file [default=%(default)s]") parser.add_argument("-d", "--dest_dir", dest="dest_dir", type=str, help="Destination directory - if not given defaults to input file name without extension") -- To view, visit https://gerrit.osmocom.org/10909 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: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8 Gerrit-Change-Number: 10909 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 12 17:44:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:44:37 +0000 Subject: Change in osmo-bts[master]: measurement: fix unit-test test_lchan_meas_process_measurement In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10815 ) Change subject: measurement: fix unit-test test_lchan_meas_process_measurement ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10815 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: I9e00ce683e8c44528804f65181dbfed9e85e3aed Gerrit-Change-Number: 10815 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 17:44: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 Sep 12 17:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:46:53 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10814 ) Change subject: measurement: remove missed interval end detection ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Sep 2018 17:46: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 Sep 12 17:47:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:47:07 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10908 ) Change subject: cosmetic: fix typo in comment ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10908 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: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c Gerrit-Change-Number: 10908 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 17:47: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 Sep 12 17:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:48:59 +0000 Subject: Change in osmo-bsc[master]: LCLS: use type and tch_mode from lchan to check codec In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10905 ) Change subject: LCLS: use type and tch_mode from lchan to check codec ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 17:48: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 Sep 12 17:49:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:49:28 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 17:49: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 Sep 12 17:49:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:49:56 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 17:49: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 Sep 12 17:51:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Sep 2018 17:51:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10904 ) Change subject: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10904 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: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7 Gerrit-Change-Number: 10904 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Sep 2018 17:51:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Sep 12 19:56:33 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:56:33 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b996f81c49f0_4c4de8c68c978c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 108s] No package 'libpcsclite' found [ 108s] simtrace2-remsim.o: In function `main': [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 108s] apdu_dispatch.o: In function `apdu_segment_in': [ 108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 108s] collect2: error: ld returned 1 exit status [ 108s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 108s] make[2]: *** [simtrace2-remsim] Error 1 [ 108s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 108s] Makefile:20: recipe for target 'utils' failed [ 108s] make[1]: *** [utils] Error 2 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 108s] dh_auto_build: make -j1 returned exit code 2 [ 108s] debian/rules:4: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 108s] [ 108s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:56:20 UTC 2018. [ 108s] [ 108s] ### VM INTERACTION START ### [ 112s] [ 105.358234] sysrq: SysRq : Power Off [ 112s] [ 105.363953] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:56:24 UTC 2018. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:57:24 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:57:24 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b996fbb876e8_4c4de8c68c9806a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 144s] No package 'libpcsclite' found [ 144s] simtrace2-remsim.o: In function `main': [ 144s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 144s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 144s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 144s] apdu_dispatch.o: In function `apdu_segment_in': [ 144s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 144s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 144s] collect2: error: ld returned 1 exit status [ 144s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 144s] make[2]: *** [simtrace2-remsim] Error 1 [ 144s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 144s] Makefile:20: recipe for target 'utils' failed [ 144s] make[1]: *** [utils] Error 2 [ 144s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 144s] dh_auto_build: make -j1 returned exit code 2 [ 144s] debian/rules:4: recipe for target 'build' failed [ 144s] make: *** [build] Error 2 [ 144s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 144s] [ 144s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:19 UTC 2018. [ 144s] [ 144s] ### VM INTERACTION START ### [ 147s] [ 136.731316] sysrq: SysRq : Power Off [ 147s] [ 136.739459] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:22 UTC 2018. [ 147s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:57:41 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:57:41 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b996fbbc9280_4c4de8c68c981ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 163s] No package 'libpcsclite' found [ 163s] simtrace2-remsim.o: In function `main': [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 163s] apdu_dispatch.o: In function `apdu_segment_in': [ 163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 163s] collect2: error: ld returned 1 exit status [ 163s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 163s] make[2]: *** [simtrace2-remsim] Error 1 [ 163s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 163s] Makefile:20: recipe for target 'utils' failed [ 163s] make[1]: *** [utils] Error 2 [ 163s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 163s] dh_auto_build: make -j1 returned exit code 2 [ 163s] debian/rules:4: recipe for target 'build' failed [ 163s] make: *** [build] Error 2 [ 163s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 163s] [ 163s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:21 UTC 2018. [ 163s] [ 163s] ### VM INTERACTION START ### [ 167s] [ 154.778991] sysrq: SysRq : Power Off [ 167s] [ 154.844599] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:25 UTC 2018. [ 167s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:57:41 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:57:41 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b996fbc2c6e9_4c4de8c68c982ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 133s] No package 'libpcsclite' found [ 133s] simtrace2-remsim.o: In function `main': [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 133s] apdu_dispatch.o: In function `apdu_segment_in': [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 133s] collect2: error: ld returned 1 exit status [ 133s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 133s] make[2]: *** [simtrace2-remsim] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 133s] Makefile:20: recipe for target 'utils' failed [ 133s] make[1]: *** [utils] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] dh_auto_build: make -j1 returned exit code 2 [ 133s] debian/rules:4: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] lamb72 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:26 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 124.297722] sysrq: SysRq : Power Off [ 136s] [ 124.305001] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] lamb72 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:30 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:57:58 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:57:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b996fda9becc_4c4de8c68c98311@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 161s] No package 'libpcsclite' found [ 161s] simtrace2-remsim.o: In function `main': [ 161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 161s] apdu_dispatch.o: In function `apdu_segment_in': [ 161s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 161s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 161s] collect2: error: ld returned 1 exit status [ 161s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 161s] make[2]: *** [simtrace2-remsim] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 161s] Makefile:20: recipe for target 'utils' failed [ 161s] make[1]: *** [utils] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: make -j1 returned exit code 2 [ 161s] debian/rules:4: recipe for target 'build' failed [ 161s] make: *** [build] Error 2 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] [ 161s] lamb15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:37 UTC 2018. [ 161s] [ 161s] ### VM INTERACTION START ### [ 165s] [ 153.978973] sysrq: SysRq : Power Off [ 165s] [ 153.986664] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:41 UTC 2018. [ 165s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:57:58 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:57:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b996fdaf29d1_4c4de8c68c98468@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 153s] No package 'libpcsclite' found [ 153s] simtrace2-remsim.o: In function `main': [ 153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 153s] apdu_dispatch.o: In function `apdu_segment_in': [ 153s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 153s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 153s] collect2: error: ld returned 1 exit status [ 153s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 153s] make[2]: *** [simtrace2-remsim] Error 1 [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 153s] Makefile:20: recipe for target 'utils' failed [ 153s] make[1]: *** [utils] Error 2 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 153s] dh_auto_build: make -j1 returned exit code 2 [ 153s] debian/rules:4: recipe for target 'build' failed [ 153s] make: *** [build] Error 2 [ 153s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 153s] [ 153s] lamb23 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:45 UTC 2018. [ 153s] [ 153s] ### VM INTERACTION START ### [ 156s] [ 144.164770] sysrq: SysRq : Power Off [ 156s] [ 144.170538] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] lamb23 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:49 UTC 2018. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:57:58 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:57:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b996fdb4e328_4c4de8c68c9857f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 135s] No package 'libpcsclite' found [ 135s] simtrace2-remsim.o: In function `main': [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 135s] apdu_dispatch.o: In function `apdu_segment_in': [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 135s] collect2: error: ld returned 1 exit status [ 135s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 135s] make[2]: *** [simtrace2-remsim] Error 1 [ 135s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 135s] Makefile:20: recipe for target 'utils' failed [ 135s] make[1]: *** [utils] Error 2 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] dh_auto_build: make -j1 returned exit code 2 [ 135s] debian/rules:4: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:47 UTC 2018. [ 135s] [ 135s] ### VM INTERACTION START ### [ 139s] [ 128.976954] sysrq: SysRq : Power Off [ 139s] [ 128.991720] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:57:51 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 19:58:33 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 19:58:33 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b996ffa57e53_4c4de8c68c98690@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 228s] No package 'libpcsclite' found [ 228s] simtrace2-remsim.o: In function `main': [ 228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 228s] apdu_dispatch.o: In function `apdu_segment_in': [ 228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 228s] collect2: error: ld returned 1 exit status [ 228s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 228s] make[2]: *** [simtrace2-remsim] Error 1 [ 228s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 228s] Makefile:20: recipe for target 'utils' failed [ 228s] make[1]: *** [utils] Error 2 [ 228s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 228s] dh_auto_build: make -j1 returned exit code 2 [ 228s] debian/rules:4: recipe for target 'build' failed [ 228s] make: *** [build] Error 2 [ 228s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 228s] [ 228s] cloud127 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:58:23 UTC 2018. [ 228s] [ 228s] ### VM INTERACTION START ### [ 231s] [ 195.903852] sysrq: SysRq : Power Off [ 231s] [ 195.912781] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] cloud127 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 19:58:29 UTC 2018. [ 233s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 12 21:10:16 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 12 Sep 2018 21:10:16 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9980bbbaf5a_4c4de8c68c110892@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 372s] No package 'libpcsclite' found [ 372s] simtrace2-remsim.o: In function `main': [ 372s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 372s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 372s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 372s] apdu_dispatch.o: In function `apdu_segment_in': [ 372s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 372s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 372s] collect2: error: ld returned 1 exit status [ 372s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 372s] make[2]: *** [simtrace2-remsim] Error 1 [ 372s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 372s] Makefile:20: recipe for target 'utils' failed [ 372s] make[1]: *** [utils] Error 2 [ 372s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 372s] dh_auto_build: make -j1 returned exit code 2 [ 372s] debian/rules:4: recipe for target 'build' failed [ 372s] make: *** [build] Error 2 [ 372s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 372s] [ 372s] armbuild15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 21:10:11 UTC 2018. [ 372s] [ 372s] ### VM INTERACTION START ### [ 376s] [ 336.927556] sysrq: SysRq : Power Off [ 376s] [ 336.930047] reboot: Power down [ 376s] ### VM INTERACTION END ### [ 376s] [ 376s] armbuild15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 21:10:15 UTC 2018. [ 376s] -- 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 Sep 13 03:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 03:23:23 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10910 Change subject: Implement RR Classmark Enquiry ...................................................................... Implement RR Classmark Enquiry If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to the MS. (The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC, is already implemented.) Related: OS#3043 (A5/3 encryption) Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 3 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10910/1 diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 7b7a62f..e2e861d 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -21,6 +21,7 @@ uint8_t *classmark2_lv); int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, struct msgb *msg, struct bsc_subscr *bsub); +int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 2b4a1ba..35044a3 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -273,6 +273,21 @@ return rsl_siemens_mrpci(lchan, &mrpci); } +/* 3GPP 44.018 9.1.12 Classmark Enquiry */ +int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan) +{ + struct msgb *msg = gsm48_msgb_alloc_name("GSM 44.018 Classmark Enquiry"); + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + + msg->lchan = lchan; + gh->proto_discr = GSM48_PDISC_RR; + gh->msg_type = GSM48_MT_RR_CLSM_ENQ; + + DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan), msgb_length(msg)); + + return gsm48_sendmsg(msg); +} + /* Chapter 9.1.9: Ciphering Mode Command */ int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv) { diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index d6b0b6d..97daa5c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -870,6 +870,9 @@ case BSS_MAP_MSG_HANDOVER_CMD: ret = bssmap_handle_handover_cmd(conn, msg, length); break; + case BSS_MAP_MSG_CLASSMARK_RQST: + ret = gsm48_send_rr_classmark_enquiry(conn->lchan); + break; default: LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n", gsm0808_bssmap_name(msg->l4h[0])); -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 03:37:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 03:37:41 +0000 Subject: Change in libosmocore[master]: gsm0808: implement BSSMAP Classmark Request Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10911 Change subject: gsm0808: implement BSSMAP Classmark Request ...................................................................... gsm0808: implement BSSMAP Classmark Request Related: OS#3043 Change-Id: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/10911/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 5ae0af8..f4fc7c4 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -51,6 +51,7 @@ const uint8_t *cipher_response_mode); struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id); struct msgb *gsm0808_create_cipher_reject(uint8_t cause); +struct msgb *gsm0808_create_classmark_request(); struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); struct msgb *gsm0808_create_sapi_reject(uint8_t link_id); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e3b10d0..9a9f70e 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -341,6 +341,19 @@ return msg; } +/*! Create BSSMAP Classmark Request message + * \returns callee-allocated msgb with BSSMAP Classmark Request message */ +struct msgb *gsm0808_create_classmark_request() +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "classmark-request"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_CLASSMARK_RQST); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; +} /*! Create BSSMAP Classmark Update message * \param[in] cm2 Classmark 2 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 60d6ed8..0c40c88 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -156,6 +156,7 @@ gsm0808_create_cipher; gsm0808_create_cipher_complete; gsm0808_create_cipher_reject; +gsm0808_create_classmark_request; gsm0808_create_classmark_update; gsm0808_create_clear_command; gsm0808_create_clear_complete; -- To view, visit https://gerrit.osmocom.org/10911 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: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 Gerrit-Change-Number: 10911 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 07:18:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 13 Sep 2018 07:18:18 +0000 Subject: Change in pysim[master]: cards: Add support for Wavemobile SIM In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10047 ) Change subject: cards: Add support for Wavemobile SIM ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10047 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: Ida3f37bd6e3ac995812aeddc9770f1ccd54ecf3f Gerrit-Change-Number: 10047 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 13 Sep 2018 07:18: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 Sep 13 07:18:33 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 13 Sep 2018 07:18:33 +0000 Subject: Change in pysim[master]: cards: Add support for Wavemobile SIM In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/10047 ) Change subject: cards: Add support for Wavemobile SIM ...................................................................... cards: Add support for Wavemobile SIM Add support to handle Wavemobile sim cards. The support excludes some parameters. For example it is not possible to write own KI keys yet. Support covers the following files: EF.SMSP EF.IMSI EF.ACC EF.PLMNsel EF.PLMNwAcT EF.OPLMNwAcT Not yet supported are: EF.ICCID KI (propretary file) OPc (propritary file) Change-Id: Ida3f37bd6e3ac995812aeddc9770f1ccd54ecf3f Related: SYS#4245 --- M pySim/cards.py 1 file changed, 112 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/cards.py b/pySim/cards.py index e294f9a..3a25040 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -83,6 +83,30 @@ data, sw = self._scc.update_binary(EF['HPLMNwAcT'], content + 'ffffff0000' * (size/5-1)) return sw + def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'): + """ + See note in update_hplmn_act() + """ + # get size and write EF.OPLMNwAcT + data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) + size = len(data[0])/2 + hplmn = enc_plmn(mcc, mnc) + content = hplmn + access_tech + data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content + 'ffffff0000' * (size/5-1)) + return sw + + def update_plmn_act(self, mcc, mnc, access_tech='FFFF'): + """ + See note in update_hplmn_act() + """ + # get size and write EF.PLMNwAcT + data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) + size = len(data[0])/2 + hplmn = enc_plmn(mcc, mnc) + content = hplmn + access_tech + data, sw = self._scc.update_binary(EF['PLMNwAcT'], content + 'ffffff0000' * (size/5-1)) + return sw + def update_plmnsel(self, mcc, mnc): data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0) size = len(data[0])/2 @@ -752,11 +776,98 @@ # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) +class WavemobileSim(Card): + """ + WavemobileSim + + """ + + name = 'Wavemobile-SIM' + + def __init__(self, ssc): + super(WavemobileSim, self).__init__(ssc) + self._adm_chv_num = 0x0A + self._scc.cla_byte = "00" + self._scc.sel_ctrl = "0004" #request an FCP + + @classmethod + def autodetect(kls, scc): + try: + # Look for ATR + if scc.get_atr() == toBytes("3B 9F 95 80 1F C7 80 31 E0 73 F6 21 13 67 4D 45 16 00 43 01 00 8F"): + return kls(scc) + except: + return None + return None + + def program(self, p): + if not p['pin_adm']: + raise ValueError("Please provide a PIN-ADM as there is no default one") + sw = self.verify_adm(h2b(p['pin_adm'])) + if sw != '9000': + raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],)) + + # EF.ICCID + # TODO: Add programming of the ICCID + if p.get('iccid'): + print("Warning: Programming of the ICCID is not implemented for this type of card.") + + # KI (Presumably a propritary file) + # TODO: Add programming of KI + if p.get('ki'): + print("Warning: Programming of the KI is not implemented for this type of card.") + + # OPc (Presumably a propritary file) + # TODO: Add programming of OPc + if p.get('opc'): + print("Warning: Programming of the OPc is not implemented for this type of card.") + + # EF.SMSP + if p.get('smsp'): + sw = self.update_smsp(p['smsp']) + if sw != '9000': + print("Programming SMSP failed with code %s"%sw) + + # EF.IMSI + if p.get('imsi'): + sw = self.update_imsi(p['imsi']) + if sw != '9000': + print("Programming IMSI failed with code %s"%sw) + + # EF.ACC + if p.get('acc'): + sw = self.update_acc(p['acc']) + if sw != '9000': + print("Programming ACC failed with code %s"%sw) + + # EF.PLMNsel + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmnsel(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming PLMNsel failed with code %s"%sw) + + # EF.PLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming PLMNwAcT failed with code %s"%sw) + + # EF.OPLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_oplmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming OPLMNwAcT failed with code %s"%sw) + + return None + + def erase(self): + return + # In order for autodetection ... _cards_classes = [ FakeMagicSim, SuperSim, MagicSim, GrcardSim, SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, - FairwavesSIM, OpenCellsSim ] + FairwavesSIM, OpenCellsSim, WavemobileSim ] def card_autodetect(scc): for kls in _cards_classes: -- To view, visit https://gerrit.osmocom.org/10047 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: Ida3f37bd6e3ac995812aeddc9770f1ccd54ecf3f Gerrit-Change-Number: 10047 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 08:34:05 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 08:34:05 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10831 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: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 08:34:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 08:34:08 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 08:34:08 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation ...................................................................... apps/grgsm_trx: fix inaccurate sample rate calculation Change-Id: I0c309588fa0f7822abfb3919327639735db07679 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 45312e6..6efed07 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -46,7 +46,7 @@ base_port = 6700 # PHY specific - phy_sample_rate = 4 * 1625000 / 6 + phy_sample_rate = radio_if.SAMPLE_RATE phy_freq_offset_hz = None phy_tx_antenna = "TX/RX" phy_rx_antenna = "RX2" diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 407e724..2aeb49a 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -75,6 +75,9 @@ GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) + # TODO: explain where do these values come from? + SAMPLE_RATE = 4.0 * 1625000.0 / 6.0 + # FIXME: shall be measured (automatically?) for # particular device and particular clock rate. # The current value is measured for USRP B2X0 at 26e6. -- To view, visit https://gerrit.osmocom.org/10831 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: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 3 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 Sep 13 08:34:14 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 08:34:14 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10880 ) Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10880 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: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 13 Sep 2018 08:34: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 Sep 13 08:34:20 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 08:34:20 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 08:34:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 08:34:26 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 08:34:26 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10880 ) Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation ...................................................................... trx/radio_if.py: clarify magic numbers in sample rate calculation Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857 --- M python/trx/radio_if.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 2aeb49a..f7f124f 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -75,8 +75,8 @@ GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) - # TODO: explain where do these values come from? - SAMPLE_RATE = 4.0 * 1625000.0 / 6.0 + GSM_SYM_RATE = (1.0 / GSM_SYM_PERIOD_uS) * 1e6 + SAMPLE_RATE = GSM_SYM_RATE * osr # FIXME: shall be measured (automatically?) for # particular device and particular clock rate. -- To view, visit https://gerrit.osmocom.org/10880 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: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 08:34:26 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 08:34:26 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse ...................................................................... apps/grgsm_trx: migrate from getopt to argparse Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d --- M apps/grgsm_trx 1 file changed, 69 insertions(+), 106 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 6efed07..d57c979 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -4,6 +4,7 @@ # GR-GSM based transceiver # # (C) 2016-2018 by Vadim Yanitskiy +# (C) 2017-2018 by Piotr Krysik # # All Rights Reserved # @@ -22,9 +23,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import signal -import getopt import sys +from argparse import ArgumentParser +from argparse import ArgumentTypeError from gnuradio import eng_notation from grgsm.trx import ctrl_if_bb @@ -33,31 +35,25 @@ COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ - "Copyright (C) 2017 by Piotr Krysik \n" \ + "Copyright (C) 2017-2018 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" \ "There is NO WARRANTY, to the extent permitted by law.\n" class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 6700 - - # PHY specific - phy_sample_rate = radio_if.SAMPLE_RATE - phy_freq_offset_hz = None - phy_tx_antenna = "TX/RX" - phy_rx_antenna = "RX2" - phy_rx_gain = 30 - phy_tx_gain = 10 - phy_args = "" - phy_ppm = 0 - - def __init__(self): - self.print_copyright() - self.parse_argv() + def __init__(self, argv): + self.remote_addr = argv.remote_addr + self.bind_addr = argv.bind_addr + self.base_port = argv.base_port + self.phy_args = argv.args + self.phy_sample_rate = argv.sample_rate + self.phy_rx_gain = argv.rx_gain + self.phy_tx_gain = argv.tx_gain + self.phy_rx_antenna = argv.rx_antenna + self.phy_tx_antenna = argv.tx_antenna + self.phy_freq_offset_hz = argv.freq_offset + self.phy_ppm = argv.ppm # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -95,97 +91,64 @@ print("[i] Shutting down...") self.radio.shutdown() - def print_copyright(self): - print(COPYRIGHT) - - def print_help(self): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - # 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 - 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 %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" \ - " --freq-offset Shift baseband freq. (e.g. -500M)\n" \ - " --ppm Set frequency correction (default %d)\n" - - print(s % ( - self.remote_addr, - self.bind_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: - opts, args = getopt.getopt(sys.argv[1:], - "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=", "freq-offset="]) - except getopt.GetoptError as err: - # Print(help and exit) - self.print_help() - print("[!] " + str(err)) - sys.exit(2) - - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) - - # 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) - else: - print("[!] The port number should be in range [0-65536]") - sys.exit(2) - - # PHY specific - elif o in ("-a", "--device-args"): - self.phy_args = v - elif o in ("-s", "--sample-rate"): - self.phy_sample_rate = int(v) - elif o in ("-g", "--rx-gain"): - self.phy_rx_gain = int(v) - elif o in ("-G", "--tx-gain"): - self.phy_tx_gain = int(v) - elif o in ("--rx-antenna"): - self.phy_rx_antenna = v - elif o in ("--tx-antenna"): - self.phy_tx_antenna = v - elif o in ("--ppm"): - self.phy_ppm = int(v) - elif o in ("--freq-offset"): - # Convert /\d+(\.\d+)?(M|k)?/ to Hz - offset_hz = eng_notation.str_to_num(v) - self.phy_freq_offset_hz = offset_hz - def sig_handler(self, signum, frame): print("Signal %d received" % signum) if signum is signal.SIGINT: self.shutdown() sys.exit(0) +def eng_float(value): + try: + return eng_notation.str_to_num(value) + except: + raise ArgumentTypeError("invalid engineering notation " + "value: {0}".format(value)) + +def parse_argv(): + parser = ArgumentParser(prog = "grgsm_trx") + + # TRX interface specific + parser.add_argument("-i", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + parser.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + parser.add_argument("-p", "--base_port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + + # PHY specific + parser.add_argument("-a", "--args", + dest = "args", type = str, default = "", + help = "Set device arguments") + parser.add_argument("-s", "--sample-rate", + dest = "sample_rate", type = eng_float, + default = radio_if.SAMPLE_RATE, + help = "Set samp_rate (default %(default)s)") + parser.add_argument("-g", "--rx-gain", + dest = "rx_gain", type = float, default = 30, + help = "Set RX gain (default %(default)s)") + parser.add_argument("-G", "--tx-gain", + dest = "tx_gain", type = float, default = 10, + help = "Set TX gain (default %(default)s)") + parser.add_argument("--rx-antenna", + dest = "rx_antenna", type = str, default = "RX2", + help = "Set RX antenna (default %(default)s)") + parser.add_argument("--tx-antenna", + dest = "tx_antenna", type = str, default = "TX/RX", + help = "Set TX antenna (default %(default)s)") + parser.add_argument("--freq-offset", + dest = "freq_offset", type = eng_float, default = 0, + help = "Shift baseband freq. (e.g. -500M)") + parser.add_argument("--ppm", + dest = "ppm", type = float, default = 0, + help = "Set frequency correction (default %(default)s)") + + return parser.parse_args() + if __name__ == '__main__': - app = Application() + print(COPYRIGHT) + argv = parse_argv() + app = Application(argv) app.run() -- To view, visit https://gerrit.osmocom.org/10832 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: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 3 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 Sep 13 08:42:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Sep 2018 08:42:04 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Sep 2018 08:42:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 08:44:32 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Sep 2018 08:44:32 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: (1 comment) This is ready now, looking forward for reviews :) https://gerrit.osmocom.org/#/c/10862/2/debian-repo-install-test/testdata/repo-install-test.sh File debian-repo-install-test/testdata/repo-install-test.sh: https://gerrit.osmocom.org/#/c/10862/2/debian-repo-install-test/testdata/repo-install-test.sh at 1 PS2, Line 1: #!/bin/sh -ex > leaving it up to you; just thinking, typically when a jenkins run fails, it is very useful to alread [?] Okay. I've added -x in the latest patchset, so it matches what `jenkins_common.sh` is doing. -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Sep 2018 08:44:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 09:06:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:06:13 +0000 Subject: Change in osmo-ggsn[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10893 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10893 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: I563559f5b501eded44efafc60bb0c9ffdea20b3e Gerrit-Change-Number: 10893 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 09:06: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 Sep 13 09:06:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:06:16 +0000 Subject: Change in osmo-ggsn[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10893 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am R contrib/systemd/osmo-ggsn.service M debian/osmo-ggsn.install D debian/osmo-ggsn.service M debian/rules 8 files changed, 35 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index f9849c0..be378be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = lib gtp ggsn sgsnemu doc tests +SUBDIRS = lib gtp ggsn sgsnemu doc contrib tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgtp.pc @@ -12,4 +12,7 @@ EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ diff --git a/configure.ac b/configure.ac index 62812ae..bfa1364 100644 --- a/configure.ac +++ b/configure.ac @@ -38,9 +38,9 @@ case "${host}" in - i*86-*-linux-gnu*) + i*86-*-linux-gnu*) EXEC_LDADD="" ;; - *solaris*) + *solaris*) EXEC_LDADD="-lresolv -lsocket -lnsl" ;; esac @@ -126,7 +126,7 @@ # Checks for library functions. AC_PROG_GCC_TRADITIONAL # AC_FUNC_MALLOC -# AC_FUNC_MEMCMP +# AC_FUNC_MEMCMP AC_CHECK_FUNCS([gethostbyname inet_ntoa memset select socket strdup strerror strtol]) AC_CHECK_FUNCS(inet_aton inet_addr, break) @@ -169,6 +169,22 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -181,6 +197,8 @@ intl/Makefile po/Makefile sgsnemu/Makefile + contrib/Makefile + contrib/systemd/Makefile tests/Makefile tests/lib/Makefile tests/gtp/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..e6ad299 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-ggsn.service +systemdsystemunit_DATA = \ + osmo-ggsn.service +endif diff --git a/contrib/osmo-ggsn.service b/contrib/systemd/osmo-ggsn.service similarity index 100% rename from contrib/osmo-ggsn.service rename to contrib/systemd/osmo-ggsn.service diff --git a/debian/osmo-ggsn.install b/debian/osmo-ggsn.install index 522a3d1..17caef7 100644 --- a/debian/osmo-ggsn.install +++ b/debian/osmo-ggsn.install @@ -1,3 +1,4 @@ +/lib/systemd/system/osmo-ggsn.service /usr/bin/osmo-ggsn /usr/bin/sgsnemu /usr/share/man/man8/* diff --git a/debian/osmo-ggsn.service b/debian/osmo-ggsn.service deleted file mode 120000 index 3bc7d3d..0000000 --- a/debian/osmo-ggsn.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/osmo-ggsn.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 5db7886..fa087ed 100755 --- a/debian/rules +++ b/debian/rules @@ -17,3 +17,6 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg dh_strip -plibgtp3 --dbg-package=libgtp-dbg + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10893 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: I563559f5b501eded44efafc60bb0c9ffdea20b3e Gerrit-Change-Number: 10893 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 Thu Sep 13 09:07:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:07:08 +0000 Subject: Change in osmo-sip-connector[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10901 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10901 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: I672f49f1034554ce62347ff9493eca18340deb3a Gerrit-Change-Number: 10901 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 09:07: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 Sep 13 09:07:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:07:09 +0000 Subject: Change in osmo-sip-connector[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10901 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I672f49f1034554ce62347ff9493eca18340deb3a --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-sip-connector.install D debian/osmo-sip-connector.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 5a2c4a9..7c1e00c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,13 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = src tests +SUBDIRS = src tests contrib BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 916cfc3..1514faa 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) @@ -73,4 +89,6 @@ AC_OUTPUT( src/Makefile tests/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..213cc7a --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-sip-connector.service +systemdsystemunit_DATA = \ + osmo-sip-connector.service +endif diff --git a/debian/osmo-sip-connector.install b/debian/osmo-sip-connector.install index a16b95f..b776fda 100644 --- a/debian/osmo-sip-connector.install +++ b/debian/osmo-sip-connector.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-sip-connector.service usr/bin/osmo-sip-connector diff --git a/debian/osmo-sip-connector.service b/debian/osmo-sip-connector.service deleted file mode 120000 index c0ae1e1..0000000 --- a/debian/osmo-sip-connector.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-sip-connector.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 5e9e20f..e4e7ca9 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,6 @@ override_dh_strip: dh_strip --dbg-package=osmo-sip-connector-dbg + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10901 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: I672f49f1034554ce62347ff9493eca18340deb3a Gerrit-Change-Number: 10901 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 Thu Sep 13 09:10:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:10:23 +0000 Subject: Change in libosmo-sccp[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10912 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I437e6ada9f391eece75b2f2e2af3bec4e8e9f6ce --- M debian/osmo-stp.install M doc/examples/Makefile.am 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/12/10912/1 diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index 839735c..b3234e2 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-stp.cfg /lib/systemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index b1a7a0f..a8e9991 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,4 +1,7 @@ examples_stpdir = $(docdir)/examples/osmo-stp examples_stp_DATA = osmo-stp.cfg -EXTRA_DIST = $(examples_stp_DATA) +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-stp.cfg + +EXTRA_DIST = osmo-stp.cfg -- To view, visit https://gerrit.osmocom.org/10912 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: I437e6ada9f391eece75b2f2e2af3bec4e8e9f6ce Gerrit-Change-Number: 10912 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 Sep 13 09:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:10:44 +0000 Subject: Change in osmo-iuh[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10913 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I7476a1db470d3bc3a833e7657ad29f266df51667 --- M debian/osmo-hnbgw.install M doc/examples/Makefile.am 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/13/10913/1 diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install index bb70ad5..f040f23 100644 --- a/debian/osmo-hnbgw.install +++ b/debian/osmo-hnbgw.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-hnbgw.cfg lib/systemd/system/osmo-hnbgw.service usr/bin/osmo-hnbgw usr/share/doc/osmo-iuh/examples/osmo-hnbgw.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 8f14fdc..7441d48 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,7 @@ +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-hnbgw.cfg + +EXTRA_DIST = osmo-hnbgw.cfg CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' -- To view, visit https://gerrit.osmocom.org/10913 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: I7476a1db470d3bc3a833e7657ad29f266df51667 Gerrit-Change-Number: 10913 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 Sep 13 09:11:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:11:05 +0000 Subject: Change in osmo-hlr[master]: Move doc/Makefile.am to doc/examples/Makefile.am Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10914 Change subject: Move doc/Makefile.am to doc/examples/Makefile.am ...................................................................... Move doc/Makefile.am to doc/examples/Makefile.am Change-Id: I89ef3abe86e7ceb7b389ac1cb227ea065bfbce37 --- M configure.ac M doc/Makefile.am A doc/examples/Makefile.am 3 files changed, 24 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/10914/1 diff --git a/configure.ac b/configure.ac index 368f1cc..99f7829 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,7 @@ AC_OUTPUT( Makefile doc/Makefile + doc/examples/Makefile src/Makefile src/gsupclient/Makefile include/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index e0e5380..aee2d7b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,22 +1 @@ -CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' - -dist-hook: - for f in $$($(CFG_FILES)); do \ - j="$(distdir)/$$f" && \ - mkdir -p "$$(dirname $$j)" && \ - $(INSTALL_DATA) $(srcdir)/$$f $$j; \ - done - -install-data-hook: - for f in $$($(CFG_FILES)); do \ - j="$(DESTDIR)$(docdir)/$$f" && \ - mkdir -p "$$(dirname $$j)" && \ - $(INSTALL_DATA) $(srcdir)/$$f $$j; \ - done - -uninstall-hook: - @$(PRE_UNINSTALL) - for f in $$($(CFG_FILES)); do \ - j="$(DESTDIR)$(docdir)/$$f" && \ - $(RM) $$j; \ - done +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..530c3fa --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,22 @@ +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done -- To view, visit https://gerrit.osmocom.org/10914 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: I89ef3abe86e7ceb7b389ac1cb227ea065bfbce37 Gerrit-Change-Number: 10914 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 Sep 13 09:11:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:11:06 +0000 Subject: Change in osmo-hlr[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10915 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I2ac73f426d9489fcd64c2eea547eb1f3ec26ae2c --- M debian/osmo-hlr.install M doc/examples/Makefile.am 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/15/10915/1 diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 5a7c37b..1b2cb56 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-hlr.cfg /lib/systemd/system/osmo-hlr.service /usr/bin/osmo-hlr /usr/bin/osmo-hlr-db-tool diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..fa8ab9b 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,8 @@ +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-hlr.cfg + +EXTRA_DIST = osmo-hlr.cfg + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10915 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: I2ac73f426d9489fcd64c2eea547eb1f3ec26ae2c Gerrit-Change-Number: 10915 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 Sep 13 09:11:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:11:19 +0000 Subject: Change in osmo-ggsn[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10916 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: If41e69295ac23a61df138ceea83794059f111086 --- M debian/osmo-ggsn.install M doc/examples/Makefile.am 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/16/10916/1 diff --git a/debian/osmo-ggsn.install b/debian/osmo-ggsn.install index 17caef7..35724d2 100644 --- a/debian/osmo-ggsn.install +++ b/debian/osmo-ggsn.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-ggsn.cfg /lib/systemd/system/osmo-ggsn.service /usr/bin/osmo-ggsn /usr/bin/sgsnemu diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..d0b677c 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,8 @@ +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-ggsn.cfg + +EXTRA_DIST = osmo-ggsn.cfg + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10916 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: If41e69295ac23a61df138ceea83794059f111086 Gerrit-Change-Number: 10916 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 Sep 13 09:11:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:11:36 +0000 Subject: Change in osmo-sgsn[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10917 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: Id898e920b934fbfb0b9abe1e3085ac817fa4634d --- M debian/osmo-gbproxy.install M debian/osmo-gtphub.install M debian/osmo-sgsn.install M doc/examples/Makefile.am 4 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/17/10917/1 diff --git a/debian/osmo-gbproxy.install b/debian/osmo-gbproxy.install index 9c7fb77..a8c0dad 100644 --- a/debian/osmo-gbproxy.install +++ b/debian/osmo-gbproxy.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-gbproxy.cfg lib/systemd/system/osmo-gbproxy.service usr/bin/osmo-gbproxy usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg usr/share/doc/osmo-gbproxy/examples diff --git a/debian/osmo-gtphub.install b/debian/osmo-gtphub.install index 568caaf..0782076 100644 --- a/debian/osmo-gtphub.install +++ b/debian/osmo-gtphub.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-gtphub.cfg lib/systemd/system/osmo-gtphub.service usr/bin/osmo-gtphub usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg usr/share/doc/osmo-gtphub/examples diff --git a/debian/osmo-sgsn.install b/debian/osmo-sgsn.install index 9d603f9..b9a46ab 100644 --- a/debian/osmo-sgsn.install +++ b/debian/osmo-sgsn.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-sgsn.cfg lib/systemd/system/osmo-sgsn.service usr/bin/osmo-sgsn usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg usr/share/doc/osmo-sgsn/examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..2b5781a 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,13 @@ +OSMOCONF_FILES = \ + osmo-gtphub/osmo-gtphub.cfg \ + osmo-sgsn/osmo-sgsn.cfg \ + osmo-gbproxy/osmo-gbproxy.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10917 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: Id898e920b934fbfb0b9abe1e3085ac817fa4634d Gerrit-Change-Number: 10917 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 Sep 13 09:11:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:11:53 +0000 Subject: Change in osmo-mgw[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10918 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I6926e989a130086f4b6c8277407377a4063f452f --- M debian/osmo-mgw.install M doc/examples/Makefile.am 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/10918/1 diff --git a/debian/osmo-mgw.install b/debian/osmo-mgw.install index ad3d3c6..6f44961 100644 --- a/debian/osmo-mgw.install +++ b/debian/osmo-mgw.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-mgw.cfg lib/systemd/system/osmo-mgw.service usr/bin/osmo-mgw usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..da504f4 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,11 @@ +OSMOCONF_FILES = \ + osmo-mgw/osmo-mgw.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10918 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: I6926e989a130086f4b6c8277407377a4063f452f Gerrit-Change-Number: 10918 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 Sep 13 09:12:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:12:25 +0000 Subject: Change in osmo-msc[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10919 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I19f3755f7637dfc017a89f503831f7df8098a919 --- M debian/osmo-msc.install M doc/examples/Makefile.am 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/10919/1 diff --git a/debian/osmo-msc.install b/debian/osmo-msc.install index 1e7f22f..e4b9646 100644 --- a/debian/osmo-msc.install +++ b/debian/osmo-msc.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-msc.cfg lib/systemd/system/osmo-msc.service usr/bin/osmo-msc usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc.cfg usr/share/doc/osmo-msc/examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..af36318 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,11 @@ +OSMOCONF_FILES = \ + osmo-msc/osmo-msc.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10919 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: I19f3755f7637dfc017a89f503831f7df8098a919 Gerrit-Change-Number: 10919 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 Sep 13 09:12:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:12:50 +0000 Subject: Change in osmo-bsc[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10920 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I87bc40fafa6269d99ccbfe49a61fc7ae4da62e80 --- M debian/osmo-bsc.install M doc/examples/Makefile.am 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/10920/1 diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 651ddb3..8f91b03 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-bsc.cfg lib/systemd/system/osmo-bsc.service usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..9d8cd75 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,11 @@ +OSMOCONF_FILES = \ + osmo-bsc/osmo-bsc.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10920 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: I87bc40fafa6269d99ccbfe49a61fc7ae4da62e80 Gerrit-Change-Number: 10920 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 Sep 13 09:13:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:13:15 +0000 Subject: Change in osmo-bts[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10921 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change cfg file names so they don't overlap when installing different osmo-bts versions, and make systemd services look for correct new name. Remove unneeded duplicated EXTRA_DIST files from root dir Makefile.am Change-Id: I75fdd06cc52ce50628efb1f9b007d2e3926db27d --- M Makefile.am M contrib/systemd/osmo-bts-lc15.service M contrib/systemd/osmo-bts-sysmo.service M contrib/systemd/osmo-bts-trx.service M debian/osmo-bts-trx.install M debian/osmo-bts-virtual.install M doc/examples/Makefile.am R doc/examples/litecell15/osmo-bts-lc15.cfg R doc/examples/octphy/osmo-bts-octphy.cfg R doc/examples/sysmo/osmo-bts-sysmo.cfg R doc/examples/trx/osmo-bts-trx.cfg R doc/examples/virtual/osmo-bts-virtual.cfg 12 files changed, 20 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/10921/1 diff --git a/Makefile.am b/Makefile.am index b573aa8..5b49bb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,6 @@ EXTRA_DIST = \ contrib/dump_docs.py contrib/screenrc-l1fwd \ contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \ - doc/examples/sysmo/osmo-bts.cfg \ - doc/examples/sysmo/sysmobts-mgr.cfg \ - doc/examples/virtual/openbsc-virtual.cfg \ - doc/examples/virtual/osmobts-virtual.cfg \ git-version-gen .version \ README.md diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service index 6aa9751..90e7fc2 100644 --- a/contrib/systemd/osmo-bts-lc15.service +++ b/contrib/systemd/osmo-bts-lc15.service @@ -5,7 +5,7 @@ Type=simple ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' -ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts-lc15.cfg -M ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' Restart=always diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 65b1f00..9255817 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -4,7 +4,7 @@ [Service] Type=simple ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' -ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts-sysmo.cfg -M ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s' Restart=always diff --git a/contrib/systemd/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service index cea8719..97c2b07 100644 --- a/contrib/systemd/osmo-bts-trx.service +++ b/contrib/systemd/osmo-bts-trx.service @@ -3,7 +3,7 @@ [Service] Type=simple -ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts.cfg +ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts-trx.cfg Restart=always RestartSec=2 diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install index 2343d25..004a7ed 100644 --- a/debian/osmo-bts-trx.install +++ b/debian/osmo-bts-trx.install @@ -1,4 +1,5 @@ +etc/osmocom/osmo-bts-trx.cfg lib/systemd/system/osmo-bts-trx.service usr/bin/osmo-bts-trx -usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg +usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx.cfg usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install index 0e6ca1b..f4d988f 100644 --- a/debian/osmo-bts-virtual.install +++ b/debian/osmo-bts-virtual.install @@ -1,5 +1,6 @@ +etc/osmocom/osmo-bts-virtual.cfg lib/systemd/system/osmo-bts-virtual.service usr/bin/osmo-bts-virtual usr/bin/osmo-bts-omldummy -usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg +usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmo-bts-virtual.cfg usr/share/doc/osmo-bts/examples/osmo-bts-virtual/openbsc-virtual.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index e4be5fc..241f579 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,38 +1,46 @@ +OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg doc_virtualdir = $(docdir)/examples/osmo-bts-virtual doc_virtual_DATA = \ - virtual/osmobts-virtual.cfg \ + virtual/osmo-bts-virtual.cfg \ virtual/openbsc-virtual.cfg EXTRA_DIST = $(doc_virtual_DATA) if ENABLE_SYSMOBTS doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo doc_sysmo_DATA = \ - sysmo/osmo-bts.cfg \ + sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg EXTRA_DIST += $(doc_sysmo_DATA) +OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg endif if ENABLE_TRX doc_trxdir = $(docdir)/examples/osmo-bts-trx doc_trx_DATA = \ - trx/osmo-bts.cfg \ + trx/osmo-bts-trx.cfg \ trx/osmo-bts-trx-calypso.cfg EXTRA_DIST += $(doc_trx_DATA) +OSMOCONF_FILES += trx/osmo-bts-trx.cfg endif if ENABLE_OCTPHY doc_octphydir = $(docdir)/examples/osmo-bts-octphy doc_octphy_DATA = \ octphy/osmo-bts-trx2dsp1.cfg \ - octphy/osmo-bts.cfg + octphy/osmo-bts-octphy.cfg EXTRA_DIST += $(doc_octphy_DATA) +OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg endif if ENABLE_LC15BTS doc_lc15dir = $(docdir)/examples/osmo-bts-lc15 doc_lc15_DATA = \ - litecell15/osmo-bts.cfg \ + litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg EXTRA_DIST += $(doc_lc15_DATA) +OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg endif + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) diff --git a/doc/examples/litecell15/osmo-bts.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg similarity index 100% rename from doc/examples/litecell15/osmo-bts.cfg rename to doc/examples/litecell15/osmo-bts-lc15.cfg diff --git a/doc/examples/octphy/osmo-bts.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg similarity index 100% rename from doc/examples/octphy/osmo-bts.cfg rename to doc/examples/octphy/osmo-bts-octphy.cfg diff --git a/doc/examples/sysmo/osmo-bts.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg similarity index 100% rename from doc/examples/sysmo/osmo-bts.cfg rename to doc/examples/sysmo/osmo-bts-sysmo.cfg diff --git a/doc/examples/trx/osmo-bts.cfg b/doc/examples/trx/osmo-bts-trx.cfg similarity index 100% rename from doc/examples/trx/osmo-bts.cfg rename to doc/examples/trx/osmo-bts-trx.cfg diff --git a/doc/examples/virtual/osmobts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg similarity index 100% rename from doc/examples/virtual/osmobts-virtual.cfg rename to doc/examples/virtual/osmo-bts-virtual.cfg -- To view, visit https://gerrit.osmocom.org/10921 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: I75fdd06cc52ce50628efb1f9b007d2e3926db27d Gerrit-Change-Number: 10921 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 Sep 13 09:13:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:13:40 +0000 Subject: Change in osmo-pcu[master]: Move examples/ to doc/examples/ Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10922 Change subject: Move examples/ to doc/examples/ ...................................................................... Move examples/ to doc/examples/ Change-Id: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe --- M Makefile.am M configure.ac A doc/Makefile.am R doc/examples/Makefile.am R doc/examples/osmo-pcu.cfg 5 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/22/10922/1 diff --git a/Makefile.am b/Makefile.am index 240e4ee..723c9ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src examples tests contrib +SUBDIRS = include src doc tests contrib EXTRA_DIST = osmoappdesc.py README.md DISTCHECK_CONFIGURE_FLAGS = \ diff --git a/configure.ac b/configure.ac index 90394e1..b5774ee 100644 --- a/configure.ac +++ b/configure.ac @@ -182,7 +182,8 @@ osmo-pcu.pc include/Makefile src/Makefile - examples/Makefile + doc/Makefile + doc/examples/Makefile tests/Makefile contrib/Makefile contrib/systemd/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/examples/Makefile.am b/doc/examples/Makefile.am similarity index 100% rename from examples/Makefile.am rename to doc/examples/Makefile.am diff --git a/examples/osmo-pcu.cfg b/doc/examples/osmo-pcu.cfg similarity index 100% rename from examples/osmo-pcu.cfg rename to doc/examples/osmo-pcu.cfg -- To view, visit https://gerrit.osmocom.org/10922 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: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe Gerrit-Change-Number: 10922 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 Sep 13 09:13:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:13:41 +0000 Subject: Change in osmo-pcu[master]: Install osmo-pcu.cfg to docdir/examples Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10923 Change subject: Install osmo-pcu.cfg to docdir/examples ...................................................................... Install osmo-pcu.cfg to docdir/examples Change-Id: I42938d9abd17575c2e0ce69cc20d44a131f26b6a --- M debian/osmo-pcu.install M doc/examples/Makefile.am 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/23/10923/1 diff --git a/debian/osmo-pcu.install b/debian/osmo-pcu.install index 1b82e96..9b7eac6 100644 --- a/debian/osmo-pcu.install +++ b/debian/osmo-pcu.install @@ -3,3 +3,4 @@ usr/bin/osmo-pcu usr/include/osmocom/pcu/pcuif_proto.h usr/lib/*/pkgconfig/osmo-pcu.pc +usr/share/doc/osmo-pcu/examples/osmo-pcu/osmo-pcu.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 1500149..0ea13e1 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,4 +1,7 @@ -pcuconfdir = $(sysconfdir)/osmocom -pcuconf_DATA = osmo-pcu.cfg +examples_pcudir = $(docdir)/examples/osmo-pcu +examples_pcu_DATA = osmo-pcu.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-pcu.cfg EXTRA_DIST = osmo-pcu.cfg -- To view, visit https://gerrit.osmocom.org/10923 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: I42938d9abd17575c2e0ce69cc20d44a131f26b6a Gerrit-Change-Number: 10923 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 Sep 13 09:14:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:14:01 +0000 Subject: Change in osmo-trx[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10924 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5 --- M debian/osmo-trx-lms.install M debian/osmo-trx-uhd.install M doc/examples/Makefile.am A doc/examples/osmo-trx-lms/osmo-trx-lms.cfg A doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg 5 files changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/24/10924/1 diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install index b58c862..b89506a 100644 --- a/debian/osmo-trx-lms.install +++ b/debian/osmo-trx-lms.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-trx-lms.cfg lib/systemd/system/osmo-trx-lms.service /usr/bin/osmo-trx-lms /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/ diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install index b7ec5ca..77236ca 100644 --- a/debian/osmo-trx-uhd.install +++ b/debian/osmo-trx-uhd.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-trx-uhd.cfg lib/systemd/system/osmo-trx-uhd.service /usr/bin/osmo-trx-uhd /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/ diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..88d9142 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,4 +1,23 @@ -CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' +OSMOCONF_FILES = +osmoconfdir = $(sysconfdir)/osmocom + +if DEVICE_UHD +OSMOCONF_FILES += osmo-trx-uhd/osmo-trx-uhd.cfg +endif + +# if DEVICE_USRP1 +# TODO: no usrp1 sample file yet +# OSMOCONF_FILES += osmo-trx-usrp1/osmo-trx-usrp1.cfg +# endif + +if DEVICE_LMS +OSMOCONF_FILES += osmo-trx-lms/osmo-trx-lms.cfg +endif + +osmoconf_DATA = $(OSMOCONF_FILES) +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: for f in $$($(CFG_FILES)); do \ diff --git a/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg b/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg new file mode 120000 index 0000000..13ae04a --- /dev/null +++ b/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg @@ -0,0 +1 @@ +osmo-trx-limesdr.cfg \ No newline at end of file diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg new file mode 120000 index 0000000..11f2320 --- /dev/null +++ b/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg @@ -0,0 +1 @@ +osmo-trx-usrp_b200.cfg \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10924 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: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5 Gerrit-Change-Number: 10924 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 Sep 13 09:14:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:14:24 +0000 Subject: Change in osmo-sip-connector[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10925 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196 --- M Makefile.am M configure.ac M debian/osmo-sip-connector.install A doc/Makefile.am A doc/examples/Makefile.am 5 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/25/10925/1 diff --git a/Makefile.am b/Makefile.am index 7c1e00c..84b252a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = src tests contrib +SUBDIRS = src tests contrib doc BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version diff --git a/configure.ac b/configure.ac index 1514faa..98fdc94 100644 --- a/configure.ac +++ b/configure.ac @@ -91,4 +91,6 @@ tests/Makefile contrib/Makefile contrib/systemd/Makefile + doc/Makefile + doc/examples/Makefile Makefile) diff --git a/debian/osmo-sip-connector.install b/debian/osmo-sip-connector.install index b776fda..335531f 100644 --- a/debian/osmo-sip-connector.install +++ b/debian/osmo-sip-connector.install @@ -1,2 +1,4 @@ +etc/osmocom/osmo-sip-connector.cfg lib/systemd/system/osmo-sip-connector.service usr/bin/osmo-sip-connector +usr/share/doc/osmo-sip-connector/examples/osmo-sip-connector/osmo-sip-connector.cfg diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..d3b851f --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,7 @@ +examples_sipcdir = $(docdir)/examples/osmo-sip-connector +examples_sipc_DATA = osmo-sip-connector.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-sip-connector.cfg + +EXTRA_DIST = osmo-sip-connector.cfg -- To view, visit https://gerrit.osmocom.org/10925 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: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196 Gerrit-Change-Number: 10925 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 Sep 13 09:14:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:14:38 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10926 Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg 7 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/10926/1 diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install index 828fb31..8f9b74f 100644 --- a/debian/osmo-bsc-mgcp.install +++ b/debian/osmo-bsc-mgcp.install @@ -1,2 +1,3 @@ +etc/osmocom/osmo-bsc-mgcp.cfg lib/systemd/system/osmo-bsc-mgcp.service usr/bin/osmo-bsc_mgcp diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install index d6cabe2..ba134d1 100644 --- a/debian/osmocom-bsc-nat.install +++ b/debian/osmocom-bsc-nat.install @@ -1,2 +1,3 @@ +/etc/osmocom/osmo-bsc-nat.cfg /lib/systemd/system/osmo-bsc-nat.service /usr/bin/osmo-bsc_nat diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install index 67c50cb..872333e 100644 --- a/debian/osmocom-bsc-sccplite.install +++ b/debian/osmocom-bsc-sccplite.install @@ -1,2 +1,3 @@ +/etc/osmocom/osmo-bsc-sccplite.cfg /lib/systemd/system/osmo-bsc-sccplite.service /usr/bin/osmo-bsc-sccplite diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install index 78e8f77..87ed7e2 100644 --- a/debian/osmocom-nitb.install +++ b/debian/osmocom-nitb.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-nitb.cfg /lib/systemd/system/osmo-nitb.service /usr/bin/osmo-nitb openbsc/contrib/*.py usr/bin/ diff --git a/openbsc/doc/examples/Makefile.am b/openbsc/doc/examples/Makefile.am index 530c3fa..1bdae3b 100644 --- a/openbsc/doc/examples/Makefile.am +++ b/openbsc/doc/examples/Makefile.am @@ -1,3 +1,21 @@ + +OSMOCONF_FILES = \ + osmo-nitb/sysmobts/openbsc.cfg \ + osmo-bsc_mgcp/osmo-bsc-mgcp.cfg + +if BUILD_NAT +OSMOCONF_FILES += osmo-bsc_nat/osmo-bsc-nat.cfg +endif + +if BUILD_BSC +OSMOCONF_FILES += osmo-bsc-sccplite/osmo-bsc-sccplite.cfg +endif + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg similarity index 100% rename from openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg rename to openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg diff --git a/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg similarity index 100% rename from openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg rename to openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg -- To view, visit https://gerrit.osmocom.org/10926 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: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 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 Sep 13 09:35:24 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 09:35:24 +0000 Subject: Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10881 ) Change subject: burst_file_source: Fix reading longer bursts ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10881 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: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 09:35: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 Sep 13 09:35:28 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 09:35:28 +0000 Subject: Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10881 ) Change subject: burst_file_source: Fix reading longer bursts ...................................................................... burst_file_source: Fix reading longer bursts - Read bursts with pmt::deserialize directly from the std::filebuf - Remove the unused unserialized variable - Add tests Since df978693 when the rx_time tags are present in the incomming stream the gsm receiver adds fm_time to the burst's PMT and the bursts that burst file sink writes becomes longer because of the additional field. The burst file source block was expecting all burst to be 147 bytes long and reading files with longer bursts was failing with an unhandled exception. terminate called after throwing an instance of 'pmt::exception' thread[thread-per-block[5]: ]: pmt_cdr: wrong_type : #f what(): pmt::deserialize: malformed input stream, tag value = : 115 Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc --- M lib/misc_utils/burst_file_source_impl.cc M lib/qa_utils/burst_source_impl.cc M python/CMakeLists.txt A python/qa_burst_file_source.py 4 files changed, 109 insertions(+), 13 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/lib/misc_utils/burst_file_source_impl.cc b/lib/misc_utils/burst_file_source_impl.cc index 4367150..85d5ad9 100644 --- a/lib/misc_utils/burst_file_source_impl.cc +++ b/lib/misc_utils/burst_file_source_impl.cc @@ -28,8 +28,6 @@ #include "burst_file_source_impl.h" #include "stdio.h" -#define PMT_SIZE 174 - namespace gr { namespace gsm { @@ -86,16 +84,13 @@ void burst_file_source_impl::run() { - char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE); - while (d_input_file.read(unserialized, PMT_SIZE) && !d_finished) + std::filebuf* pbuf = d_input_file.rdbuf(); + while (!d_finished) { - if (d_input_file.bad()) - { + pmt::pmt_t burst = pmt::deserialize(*pbuf); + if (pmt::is_eof_object(burst)) { break; } - - std::string s(unserialized, PMT_SIZE); - pmt::pmt_t burst = pmt::deserialize_str(s); message_port_pub(pmt::mp("out"), burst); } d_input_file.close(); diff --git a/lib/qa_utils/burst_source_impl.cc b/lib/qa_utils/burst_source_impl.cc index db3d85a..f415eaf 100644 --- a/lib/qa_utils/burst_source_impl.cc +++ b/lib/qa_utils/burst_source_impl.cc @@ -31,8 +31,6 @@ #include #include -#define PMT_SIZE 174 - namespace gr { namespace gsm { @@ -110,8 +108,6 @@ void burst_source_impl::run() { - char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE); - for (int i=0; i +# @section LICENSE +# +# Gr-gsm is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# Gr-gsm 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 gr-gsm; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# +# + +from gnuradio import gr, gr_unittest, blocks +import grgsm_swig as grgsm +import tempfile + +class qa_burst_file_sink (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test_blob_only (self): + # prepare the input burst file + temp = tempfile.NamedTemporaryFile() + handle = open(temp.name, "wb") + handle.write(bytearray([ + 0x07, 0x06, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0x02, 0x04, 0x03, 0x01, 0x00, 0x6f, + 0xcd, 0x00, 0x00, 0x25, 0xc9, 0x82, 0x06, 0x1c, 0xf5, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, + 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01 + ])) + handle.flush(); + + src = grgsm.burst_file_source(temp.name); + dst = grgsm.burst_sink(); + self.tb.msg_connect(src, "out", dst, "in") + self.tb.run () + + self.assertEqual([2476418], list(dst.get_framenumbers())) + self.assertEqual([1], list(dst.get_timeslots())) + self.assertEqual([ + "0000001000000101010111111110101000000000010101010111101010101001011011101111000101101111100000000001010101111010101010000000010101011101111010101001"], + list(dst.get_burst_data())) + + def test_fn_time (self): + # prepare the input burst file + temp = tempfile.NamedTemporaryFile() + handle = open(temp.name, "wb") + handle.write(bytearray([ + 0x07, + # the additional fn_time field - 51 bytes + 0x07, 0x07, 0x02, 0x00, 0x07, 0x66, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x07, 0x07, 0x0b, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x3b, 0x73, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3f, 0xe4, 0x99, 0x45, + 0xbe, 0x81, 0xc0, 0xf4, + # the 173 original 173 bytes + 0x06, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0x02, 0x04, 0x03, 0x01, 0x00, 0x6f, + 0xcd, 0x00, 0x00, 0x25, 0xc9, 0x82, 0x06, 0x1c, 0xf5, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, + 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01 + ])) + handle.flush(); + + src = grgsm.burst_file_source(temp.name); + dst = grgsm.burst_sink(); + self.tb.msg_connect(src, "out", dst, "in") + self.tb.run () + + self.assertEqual([2476418], list(dst.get_framenumbers())) + self.assertEqual([1], list(dst.get_timeslots())) + self.assertEqual([ + "0000001000000101010111111110101000000000010101010111101010101001011011101111000101101111100000000001010101111010101010000000010101011101111010101001"], + list(dst.get_burst_data())) + +if __name__ == '__main__': + gr_unittest.run(qa_burst_file_sink, "qa_burst_file_sink.xml") -- To view, visit https://gerrit.osmocom.org/10881 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: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 3 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 09:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 09:36:04 +0000 Subject: Change in osmo-pcu[master]: Move examples/ to doc/examples/ In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10922 to look at the new patch set (#2). Change subject: Move examples/ to doc/examples/ ...................................................................... Move examples/ to doc/examples/ Change-Id: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe --- M Makefile.am M configure.ac A doc/Makefile.am R doc/examples/Makefile.am R doc/examples/osmo-pcu.cfg M osmoappdesc.py 6 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/22/10922/2 -- To view, visit https://gerrit.osmocom.org/10922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe Gerrit-Change-Number: 10922 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 09:58:56 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 13 Sep 2018 09:58:56 +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 (#16). 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, 494 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/16 -- 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: 16 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 Thu Sep 13 10:06:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 10:06:56 +0000 Subject: Change in osmo-sgsn[master]: debian: Fix typo in rules preventing build with IU support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10927 Change subject: debian: Fix typo in rules preventing build with IU support ...................................................................... debian: Fix typo in rules preventing build with IU support It was discovered during OBS debian build that --enable-ui was not being passed despite being defined. Comparing with other similar projects it became clear that this override tag was not correct and it was being omitted. Change-Id: I0ad1009100fd7c2798bcf22aa84a0d90fbe41a55 --- M debian/rules 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/10927/1 diff --git a/debian/rules b/debian/rules index 58ea9bb..fb31c58 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ # debmake generated override targets # Set options for ./configure CONFIGURE_FLAGS += --enable-iu -override_dh_configure: +override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # # Do not install libtool archive, python .pyc .pyo -- To view, visit https://gerrit.osmocom.org/10927 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: I0ad1009100fd7c2798bcf22aa84a0d90fbe41a55 Gerrit-Change-Number: 10927 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 Sep 13 10:22:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 10:22:07 +0000 Subject: Change in osmo-gsm-tester[master]: Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10928 Change subject: Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git ...................................................................... Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git In osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc, osmo-bsc_mgcp was dropped and the one from openbsc.git must be used. Change-Id: Ib1c46baf4d36ab18f8064a2234a0ba28a1e7d2c2 --- M contrib/jenkins-build-osmo-mgw.sh M contrib/jenkins-build-osmo-nitb.sh M src/osmo_gsm_tester/osmo_mgcpgw.py 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/28/10928/1 diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index 43473c6..5c1ce74 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -9,4 +9,4 @@ build_repo libosmo-netif --enable-sanitize --disable-doxygen build_repo osmo-mgw --enable-sanitize -create_bin_tgz "osmo-bsc_mgcp osmo-mgw" +create_bin_tgz "osmo-mgw" diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index ef55259..1e3ecc6 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -12,4 +12,4 @@ build_repo libosmo-sccp build_repo openbsc --enable-smpp --enable-osmo-bsc --enable-nat -create_bin_tgz osmo-nitb +create_bin_tgz "osmo-nitb osmo-bsc_mgcp" diff --git a/src/osmo_gsm_tester/osmo_mgcpgw.py b/src/osmo_gsm_tester/osmo_mgcpgw.py index 82b9149..668e4ce 100644 --- a/src/osmo_gsm_tester/osmo_mgcpgw.py +++ b/src/osmo_gsm_tester/osmo_mgcpgw.py @@ -38,7 +38,7 @@ self.log('Starting osmo-mgcpgw') self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() - inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-mgw'))) + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-nitb'))) binary = inst.child('bin', 'osmo-bsc_mgcp') if not os.path.isfile(binary): raise RuntimeError('Binary missing: %r' % binary) -- To view, visit https://gerrit.osmocom.org/10928 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: Ib1c46baf4d36ab18f8064a2234a0ba28a1e7d2c2 Gerrit-Change-Number: 10928 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 Sep 13 10:37:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 10:37:40 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10926 to look at the new patch set (#3). Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/contrib/systemd/osmo-nitb.service M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg M openbsc/osmoappdesc.py 9 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/10926/3 -- To view, visit https://gerrit.osmocom.org/10926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 10:52:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 10:52:39 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10926 to look at the new patch set (#4). Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/contrib/systemd/osmo-nitb.service M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/vty_test_runner.py 11 files changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/10926/4 -- To view, visit https://gerrit.osmocom.org/10926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 11:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 11:04:22 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10926 to look at the new patch set (#5). Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/contrib/systemd/osmo-nitb.service M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/vty_test_runner.py 11 files changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/10926/5 -- To view, visit https://gerrit.osmocom.org/10926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 11:25:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 11:25:30 +0000 Subject: Change in osmo-sgsn[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10894 ) Change subject: Install systemd services with autotools ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10894 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: I103bf3468d53578045593eac31b61f7e0248495e Gerrit-Change-Number: 10894 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 11:25: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 Sep 13 11:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 11:25:38 +0000 Subject: Change in openbsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10902 ) Change subject: Install systemd services with autotools ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10902 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: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 Gerrit-Change-Number: 10902 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 11:25:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 11:25:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 11:25:53 +0000 Subject: Change in osmo-iuh[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10891 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10891 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: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 Gerrit-Change-Number: 10891 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 11:25: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 Sep 13 11:25:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 11:25:55 +0000 Subject: Change in osmo-iuh[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10891 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-hnbgw.install D debian/osmo-hnbgw.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 67445ee..2e59306 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,15 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 -SUBDIRS = src include doc +SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-ranap.pc EXTRA_DIST = asn1 .version README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index bb99dfb..559db39 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,22 @@ CFLAGS="$CFLAGS -Wall" CPPFLAGS="$CPPFLAGS -Wall" +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -98,4 +114,6 @@ include/osmocom/iuh/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile ) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..507be2d --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-hnbgw.service +systemdsystemunit_DATA = \ + osmo-hnbgw.service +endif diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install index e230915..bb70ad5 100644 --- a/debian/osmo-hnbgw.install +++ b/debian/osmo-hnbgw.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-hnbgw.service usr/bin/osmo-hnbgw usr/share/doc/osmo-iuh/examples/osmo-hnbgw.cfg diff --git a/debian/osmo-hnbgw.service b/debian/osmo-hnbgw.service deleted file mode 120000 index e69ea55..0000000 --- a/debian/osmo-hnbgw.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-hnbgw.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 9ebfdd0..6f20b3e 100755 --- a/debian/rules +++ b/debian/rules @@ -16,3 +16,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10891 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: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 Gerrit-Change-Number: 10891 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 Thu Sep 13 12:54:27 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:54:27 +0000 Subject: Change in gr-gsm[master]: trx/radio_if: add freq_offset parameter to constructor Message-ID: Piotr Krysik has uploaded this change for review. ( https://gerrit.osmocom.org/10929 Change subject: trx/radio_if: add freq_offset parameter to constructor ...................................................................... trx/radio_if: add freq_offset parameter to constructor Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/29/10929/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index d57c979..5c3dace 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -63,8 +63,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.bind_addr, self.remote_addr, - self.base_port) + self.phy_freq_offset_hz, self.bind_addr, + self.remote_addr, self.base_port) # Optional frequency offset if self.phy_freq_offset_hz is not None: diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index f7f124f..11f1d40 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -86,8 +86,8 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - trx_bind_addr, trx_remote_addr, - trx_base_port): + phy_freq_offset_hz, trx_bind_addr, + trx_remote_addr, trx_base_port): print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" % (trx_bind_addr, trx_base_port + 2, @@ -98,6 +98,7 @@ self.rx_gain = phy_rx_gain self.tx_gain = phy_tx_gain self.ppm = phy_ppm + self.freq_offset_hz = phy_freq_offset_hz gr.top_block.__init__(self, "GR-GSM TRX") -- To view, visit https://gerrit.osmocom.org/10929 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: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5 Gerrit-Change-Number: 10929 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:54:28 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove unnecessary checks of freq_offset Message-ID: Piotr Krysik has uploaded this change for review. ( https://gerrit.osmocom.org/10930 Change subject: apps/grgsm_trx: remove unnecessary checks of freq_offset ...................................................................... apps/grgsm_trx: remove unnecessary checks of freq_offset Checking if freq_offset is None doesn't make sense currently as it's always set to a float value by argparse (to 0 by default). Change-Id: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 8 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/30/10930/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 5c3dace..b53d12a 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -66,10 +66,6 @@ self.phy_freq_offset_hz, self.bind_addr, self.remote_addr, self.base_port) - # Optional frequency offset - if self.phy_freq_offset_hz is not None: - self.radio.freq_offset_hz = self.phy_freq_offset_hz - # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 11f1d40..a9b0358 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -60,7 +60,6 @@ class radio_if(gr.top_block): # PHY specific variables - freq_offset_hz = None rx_freq = 935e6 tx_freq = 890e6 osr = 4 @@ -280,21 +279,19 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting RX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + fc += self.freq_offset_hz + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting TX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + fc += self.freq_offset_hz + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/10930 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: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7 Gerrit-Change-Number: 10930 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:55:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:55:01 +0000 Subject: Change in openbsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10902 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10902 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: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 Gerrit-Change-Number: 10902 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12:55:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:55:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:55:55 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10926 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10926/5/openbsc/contrib/systemd/osmo-nitb.service File openbsc/contrib/systemd/osmo-nitb.service: https://gerrit.osmocom.org/#/c/10926/5/openbsc/contrib/systemd/osmo-nitb.service at 7 PS5, Line 7: openbsc.cfg I don't like the naming change here. osmo-nitb.cfg sounds better than openbsc.cfg if the program is osmo-nitb... -- To view, visit https://gerrit.osmocom.org/10926 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: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12:55:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:56:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:01 +0000 Subject: Change in openbsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10902 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 --- M debian/control M debian/osmo-bsc-mgcp.install D debian/osmo-bsc-mgcp.service M debian/osmocom-bsc-nat.install D debian/osmocom-bsc-nat.service M debian/osmocom-bsc-sccplite.install D debian/osmocom-bsc-sccplite.service M debian/osmocom-nitb.install D debian/osmocom-nitb.service M debian/rules M openbsc/Makefile.am M openbsc/configure.ac A openbsc/contrib/Makefile.am A openbsc/contrib/systemd/Makefile.am D openbsc/debian/osmo-bsc-mgcp.service 15 files changed, 45 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 46a8ab5..0e9bb0c 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, + dh-systemd (>= 1.5), libosmo-abis-dev, libosmo-netif-dev, libdbd-sqlite3, diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install index 1550437..828fb31 100644 --- a/debian/osmo-bsc-mgcp.install +++ b/debian/osmo-bsc-mgcp.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-bsc-mgcp.service usr/bin/osmo-bsc_mgcp diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service deleted file mode 120000 index 0f8700b..0000000 --- a/debian/osmo-bsc-mgcp.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install index b561a7e..d6cabe2 100644 --- a/debian/osmocom-bsc-nat.install +++ b/debian/osmocom-bsc-nat.install @@ -1 +1,2 @@ +/lib/systemd/system/osmo-bsc-nat.service /usr/bin/osmo-bsc_nat diff --git a/debian/osmocom-bsc-nat.service b/debian/osmocom-bsc-nat.service deleted file mode 120000 index 0d5b3be..0000000 --- a/debian/osmocom-bsc-nat.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-bsc-nat.service \ No newline at end of file diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install index 9ce795c..67c50cb 100644 --- a/debian/osmocom-bsc-sccplite.install +++ b/debian/osmocom-bsc-sccplite.install @@ -1,2 +1,2 @@ -/usr/bin/osmo-bsc_mgcp +/lib/systemd/system/osmo-bsc-sccplite.service /usr/bin/osmo-bsc-sccplite diff --git a/debian/osmocom-bsc-sccplite.service b/debian/osmocom-bsc-sccplite.service deleted file mode 120000 index f30a9db..0000000 --- a/debian/osmocom-bsc-sccplite.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-bsc-sccplite.service \ No newline at end of file diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install index 26caf71..78e8f77 100644 --- a/debian/osmocom-nitb.install +++ b/debian/osmocom-nitb.install @@ -1,2 +1,3 @@ +/lib/systemd/system/osmo-nitb.service /usr/bin/osmo-nitb -openbsc/contrib/*.py usr/bin/ \ No newline at end of file +openbsc/contrib/*.py usr/bin/ diff --git a/debian/osmocom-nitb.service b/debian/osmocom-nitb.service deleted file mode 120000 index eaecd9d..0000000 --- a/debian/osmocom-nitb.service +++ /dev/null @@ -1 +0,0 @@ -../openbsc/contrib/systemd/osmo-nitb.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index ef08596..e37a262 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --sourcedirectory=openbsc --with autoreconf + dh $@ --sourcedirectory=openbsc --with=systemd --with autoreconf # This is needed for debian stable (squeeze) override_dh_autoreconf: @@ -25,7 +25,7 @@ override_dh_auto_configure: echo $(VERSION) > openbsc/.tarball-version - dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp + dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system # Print test results in case of a failure override_dh_auto_test: diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index dc53929..792dcf2 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -13,6 +13,7 @@ include \ src \ tests \ + contrib \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig @@ -21,6 +22,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/openbsc/configure.ac b/openbsc/configure.ac index c3615d6..75dd5d3 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -220,6 +220,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -262,4 +278,6 @@ tests/nanobts_omlattr/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/openbsc/contrib/Makefile.am b/openbsc/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/openbsc/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/openbsc/contrib/systemd/Makefile.am b/openbsc/contrib/systemd/Makefile.am new file mode 100644 index 0000000..69f973e --- /dev/null +++ b/openbsc/contrib/systemd/Makefile.am @@ -0,0 +1,14 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = osmo-nitb.service osmo-bsc-mgcp.service + +if BUILD_NAT +SYSTEMD_SERVICES += osmo-bsc-nat.service +endif + +if BUILD_BSC +SYSTEMD_SERVICES += osmo-bsc-sccplite.service +endif + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif # HAVE_SYSTEMD diff --git a/openbsc/debian/osmo-bsc-mgcp.service b/openbsc/debian/osmo-bsc-mgcp.service deleted file mode 120000 index eb73b7b..0000000 --- a/openbsc/debian/osmo-bsc-mgcp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10902 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: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 Gerrit-Change-Number: 10902 Gerrit-PatchSet: 3 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 Sep 13 12:56:22 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:56:22 +0000 Subject: Change in gr-gsm[master]: README.md: fix white space In-Reply-To: References: Message-ID: Piotr Krysik has abandoned this change. ( https://gerrit.osmocom.org/9971 ) Change subject: README.md: fix white space ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I818b5296e2a208df9f096bcc9d13b88ffe01379c Gerrit-Change-Number: 9971 Gerrit-PatchSet: 2 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:56:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:24 +0000 Subject: Change in osmo-sgsn[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10894 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10894 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: I103bf3468d53578045593eac31b61f7e0248495e Gerrit-Change-Number: 10894 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12:56: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 Sep 13 12:56:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:43 +0000 Subject: Change in osmo-sgsn[master]: debian: Fix typo in rules preventing build with IU support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10927 ) Change subject: debian: Fix typo in rules preventing build with IU support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10927 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: I0ad1009100fd7c2798bcf22aa84a0d90fbe41a55 Gerrit-Change-Number: 10927 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12:56: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 Sep 13 12:56:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:54 +0000 Subject: Change in osmo-sgsn[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10917 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10917 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: Id898e920b934fbfb0b9abe1e3085ac817fa4634d Gerrit-Change-Number: 10917 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12: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 Thu Sep 13 12:56:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:56 +0000 Subject: Change in osmo-sgsn[master]: debian: Fix typo in rules preventing build with IU support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10927 ) Change subject: debian: Fix typo in rules preventing build with IU support ...................................................................... debian: Fix typo in rules preventing build with IU support It was discovered during OBS debian build that --enable-ui was not being passed despite being defined. Comparing with other similar projects it became clear that this override tag was not correct and it was being omitted. Change-Id: I0ad1009100fd7c2798bcf22aa84a0d90fbe41a55 --- M debian/rules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 58ea9bb..fb31c58 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ # debmake generated override targets # Set options for ./configure CONFIGURE_FLAGS += --enable-iu -override_dh_configure: +override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # # Do not install libtool archive, python .pyc .pyo -- To view, visit https://gerrit.osmocom.org/10927 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: I0ad1009100fd7c2798bcf22aa84a0d90fbe41a55 Gerrit-Change-Number: 10927 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 Sep 13 12:56:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:56 +0000 Subject: Change in osmo-sgsn[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10894 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I103bf3468d53578045593eac31b61f7e0248495e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/control M debian/osmo-gbproxy.install D debian/osmo-gbproxy.service M debian/osmo-gtphub.install D debian/osmo-gtphub.service M debian/osmo-sgsn.install D debian/osmo-sgsn.service M debian/rules 12 files changed, 37 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 38fdcba..1883ab5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,6 +12,7 @@ doc \ include \ src \ + contrib \ tests \ $(NULL) @@ -21,6 +22,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index c233fa3..73b6dce 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -201,4 +217,6 @@ tests/v42bis/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..b644f34 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,9 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = \ + osmo-gbproxy.service \ + osmo-gtphub.service \ + osmo-sgsn.service + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif diff --git a/debian/control b/debian/control index 330945f..46a6b67 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Maintainer: Alexander Couzens Build-Depends: debhelper (>=9), dh-autoreconf, + dh-systemd (>= 1.5), autotools-dev, autoconf, automake, diff --git a/debian/osmo-gbproxy.install b/debian/osmo-gbproxy.install index 8272551..9c7fb77 100644 --- a/debian/osmo-gbproxy.install +++ b/debian/osmo-gbproxy.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-gbproxy.service usr/bin/osmo-gbproxy usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg usr/share/doc/osmo-gbproxy/examples usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy.cfg usr/share/doc/osmo-gbproxy/examples diff --git a/debian/osmo-gbproxy.service b/debian/osmo-gbproxy.service deleted file mode 120000 index d23c649..0000000 --- a/debian/osmo-gbproxy.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-gbproxy.service \ No newline at end of file diff --git a/debian/osmo-gtphub.install b/debian/osmo-gtphub.install index ed0bd1b..568caaf 100644 --- a/debian/osmo-gtphub.install +++ b/debian/osmo-gtphub.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-gtphub.service usr/bin/osmo-gtphub usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg usr/share/doc/osmo-gtphub/examples usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub.cfg usr/share/doc/osmo-gtphub/examples diff --git a/debian/osmo-gtphub.service b/debian/osmo-gtphub.service deleted file mode 120000 index 81a0eb4..0000000 --- a/debian/osmo-gtphub.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-gtphub.service \ No newline at end of file diff --git a/debian/osmo-sgsn.install b/debian/osmo-sgsn.install index 9390deb..9d603f9 100644 --- a/debian/osmo-sgsn.install +++ b/debian/osmo-sgsn.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-sgsn.service usr/bin/osmo-sgsn usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg usr/share/doc/osmo-sgsn/examples usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg usr/share/doc/osmo-sgsn/examples diff --git a/debian/osmo-sgsn.service b/debian/osmo-sgsn.service deleted file mode 120000 index de22d90..0000000 --- a/debian/osmo-sgsn.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-sgsn.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index fb31c58..af6b5b6 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ # debmake generated override targets # Set options for ./configure -CONFIGURE_FLAGS += --enable-iu +CONFIGURE_FLAGS += --enable-iu --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10894 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: I103bf3468d53578045593eac31b61f7e0248495e Gerrit-Change-Number: 10894 Gerrit-PatchSet: 3 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 Sep 13 12:56:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:56:56 +0000 Subject: Change in osmo-sgsn[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10917 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: Id898e920b934fbfb0b9abe1e3085ac817fa4634d --- M debian/osmo-gbproxy.install M debian/osmo-gtphub.install M debian/osmo-sgsn.install M doc/examples/Makefile.am 4 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-gbproxy.install b/debian/osmo-gbproxy.install index 9c7fb77..a8c0dad 100644 --- a/debian/osmo-gbproxy.install +++ b/debian/osmo-gbproxy.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-gbproxy.cfg lib/systemd/system/osmo-gbproxy.service usr/bin/osmo-gbproxy usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg usr/share/doc/osmo-gbproxy/examples diff --git a/debian/osmo-gtphub.install b/debian/osmo-gtphub.install index 568caaf..0782076 100644 --- a/debian/osmo-gtphub.install +++ b/debian/osmo-gtphub.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-gtphub.cfg lib/systemd/system/osmo-gtphub.service usr/bin/osmo-gtphub usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg usr/share/doc/osmo-gtphub/examples diff --git a/debian/osmo-sgsn.install b/debian/osmo-sgsn.install index 9d603f9..b9a46ab 100644 --- a/debian/osmo-sgsn.install +++ b/debian/osmo-sgsn.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-sgsn.cfg lib/systemd/system/osmo-sgsn.service usr/bin/osmo-sgsn usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg usr/share/doc/osmo-sgsn/examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..2b5781a 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,13 @@ +OSMOCONF_FILES = \ + osmo-gtphub/osmo-gtphub.cfg \ + osmo-sgsn/osmo-sgsn.cfg \ + osmo-gbproxy/osmo-gbproxy.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10917 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: Id898e920b934fbfb0b9abe1e3085ac817fa4634d Gerrit-Change-Number: 10917 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 Thu Sep 13 12:57:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:57:14 +0000 Subject: Change in osmo-gsm-tester[master]: Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10928 ) Change subject: Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10928 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: Ib1c46baf4d36ab18f8064a2234a0ba28a1e7d2c2 Gerrit-Change-Number: 10928 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 12:57: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 Sep 13 12:57:16 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:57:16 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove unnecessary checks of freq_offset In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10930 ) Change subject: apps/grgsm_trx: remove unnecessary checks of freq_offset ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10930 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: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7 Gerrit-Change-Number: 10930 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 13 Sep 2018 12:57: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 Sep 13 12:57:24 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:57:24 +0000 Subject: Change in gr-gsm[master]: trx/radio_if: add freq_offset parameter to constructor In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10929 ) Change subject: trx/radio_if: add freq_offset parameter to constructor ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10929 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: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5 Gerrit-Change-Number: 10929 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 13 Sep 2018 12:57: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 Sep 13 12:57:28 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:57:28 +0000 Subject: Change in gr-gsm[master]: trx/radio_if: add freq_offset parameter to constructor In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10929 ) Change subject: trx/radio_if: add freq_offset parameter to constructor ...................................................................... trx/radio_if: add freq_offset parameter to constructor Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index d57c979..5c3dace 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -63,8 +63,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.bind_addr, self.remote_addr, - self.base_port) + self.phy_freq_offset_hz, self.bind_addr, + self.remote_addr, self.base_port) # Optional frequency offset if self.phy_freq_offset_hz is not None: diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index f7f124f..11f1d40 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -86,8 +86,8 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - trx_bind_addr, trx_remote_addr, - trx_base_port): + phy_freq_offset_hz, trx_bind_addr, + trx_remote_addr, trx_base_port): print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" % (trx_bind_addr, trx_base_port + 2, @@ -98,6 +98,7 @@ self.rx_gain = phy_rx_gain self.tx_gain = phy_tx_gain self.ppm = phy_ppm + self.freq_offset_hz = phy_freq_offset_hz gr.top_block.__init__(self, "GR-GSM TRX") -- To view, visit https://gerrit.osmocom.org/10929 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: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5 Gerrit-Change-Number: 10929 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:57:29 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:57:29 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove unnecessary checks of freq_offset In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10930 ) Change subject: apps/grgsm_trx: remove unnecessary checks of freq_offset ...................................................................... apps/grgsm_trx: remove unnecessary checks of freq_offset Checking if freq_offset is None doesn't make sense currently as it's always set to a float value by argparse (to 0 by default). Change-Id: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 8 insertions(+), 15 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 5c3dace..b53d12a 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -66,10 +66,6 @@ self.phy_freq_offset_hz, self.bind_addr, self.remote_addr, self.base_port) - # Optional frequency offset - if self.phy_freq_offset_hz is not None: - self.radio.freq_offset_hz = self.phy_freq_offset_hz - # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 11f1d40..a9b0358 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -60,7 +60,6 @@ class radio_if(gr.top_block): # PHY specific variables - freq_offset_hz = None rx_freq = 935e6 tx_freq = 890e6 osr = 4 @@ -280,21 +279,19 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting RX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + fc += self.freq_offset_hz + print("[#] Shifting RX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): - if self.freq_offset_hz is not None: - fc += self.freq_offset_hz - print("[#] Shifting TX freq. to %s (offset is %s)" - % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + fc += self.freq_offset_hz + print("[#] Shifting TX freq. to %s (offset is %s)" + % (eng_notation.num_to_str(fc), + eng_notation.num_to_str(self.freq_offset_hz))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/10930 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: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7 Gerrit-Change-Number: 10930 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:57:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:57:37 +0000 Subject: Change in osmo-pcu[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10899 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10899 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: Ie4c7e81495181059d1dff1c194d52d11fb72ed03 Gerrit-Change-Number: 10899 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 12: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 Thu Sep 13 12:57:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:57:48 +0000 Subject: Change in osmo-pcu[master]: Move examples/ to doc/examples/ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10922 ) Change subject: Move examples/ to doc/examples/ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10922 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: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe Gerrit-Change-Number: 10922 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12:57: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 Sep 13 12:58:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 12:58:01 +0000 Subject: Change in osmo-pcu[master]: Install osmo-pcu.cfg to docdir/examples In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10923 ) Change subject: Install osmo-pcu.cfg to docdir/examples ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10923 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: I42938d9abd17575c2e0ce69cc20d44a131f26b6a Gerrit-Change-Number: 10923 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 12:58:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 12:59:30 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 12:59:30 +0000 Subject: Change in gr-gsm[master]: grgsm_channelize: Add ichar data type In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10909 ) Change subject: grgsm_channelize: Add ichar data type ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10909 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: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8 Gerrit-Change-Number: 10909 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Thu, 13 Sep 2018 12:59: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 Sep 13 13:03:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:03:48 +0000 Subject: Change in osmo-pcu[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10899 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10899 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: Ie4c7e81495181059d1dff1c194d52d11fb72ed03 Gerrit-Change-Number: 10899 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13: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 Thu Sep 13 13:03:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:03:50 +0000 Subject: Change in osmo-pcu[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10899 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ie4c7e81495181059d1dff1c194d52d11fb72ed03 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am R contrib/systemd/osmo-pcu.service M debian/osmo-pcu.install D debian/osmo-pcu.service M debian/rules 8 files changed, 32 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 7a4e6c0..240e4ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,11 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src examples tests +SUBDIRS = include src examples tests contrib EXTRA_DIST = osmoappdesc.py README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 7288c24..90394e1 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,22 @@ STD_DEFINES_AND_INCLUDES="-Wall" AC_SUBST(STD_DEFINES_AND_INCLUDES) +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) @@ -168,4 +184,6 @@ src/Makefile examples/Makefile tests/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..f565234 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-pcu.service +systemdsystemunit_DATA = \ + osmo-pcu.service +endif diff --git a/contrib/osmo-pcu.service b/contrib/systemd/osmo-pcu.service similarity index 100% rename from contrib/osmo-pcu.service rename to contrib/systemd/osmo-pcu.service diff --git a/debian/osmo-pcu.install b/debian/osmo-pcu.install index 80316ee..1b82e96 100644 --- a/debian/osmo-pcu.install +++ b/debian/osmo-pcu.install @@ -1,4 +1,5 @@ etc/osmocom/osmo-pcu.cfg +lib/systemd/system/osmo-pcu.service usr/bin/osmo-pcu usr/include/osmocom/pcu/pcuif_proto.h usr/lib/*/pkgconfig/osmo-pcu.pc diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service deleted file mode 120000 index f077431..0000000 --- a/debian/osmo-pcu.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/osmo-pcu.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index cffb6ca..712dd75 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10899 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: Ie4c7e81495181059d1dff1c194d52d11fb72ed03 Gerrit-Change-Number: 10899 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 Thu Sep 13 13:04:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:04:07 +0000 Subject: Change in osmo-pcu[master]: Move examples/ to doc/examples/ In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10922 ) Change subject: Move examples/ to doc/examples/ ...................................................................... Move examples/ to doc/examples/ Change-Id: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe --- M Makefile.am M configure.ac A doc/Makefile.am R doc/examples/Makefile.am R doc/examples/osmo-pcu.cfg M osmoappdesc.py 6 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 240e4ee..723c9ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src examples tests contrib +SUBDIRS = include src doc tests contrib EXTRA_DIST = osmoappdesc.py README.md DISTCHECK_CONFIGURE_FLAGS = \ diff --git a/configure.ac b/configure.ac index 90394e1..b5774ee 100644 --- a/configure.ac +++ b/configure.ac @@ -182,7 +182,8 @@ osmo-pcu.pc include/Makefile src/Makefile - examples/Makefile + doc/Makefile + doc/examples/Makefile tests/Makefile contrib/Makefile contrib/systemd/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/examples/Makefile.am b/doc/examples/Makefile.am similarity index 100% rename from examples/Makefile.am rename to doc/examples/Makefile.am diff --git a/examples/osmo-pcu.cfg b/doc/examples/osmo-pcu.cfg similarity index 100% rename from examples/osmo-pcu.cfg rename to doc/examples/osmo-pcu.cfg diff --git a/osmoappdesc.py b/osmoappdesc.py index b202dc6..b3938f5 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -15,12 +15,12 @@ # along with this program. If not, see . app_configs = { - "osmo-pcu": ["examples/osmo-pcu.cfg"] + "osmo-pcu": ["doc/examples/osmo-pcu.cfg"] } apps = [(4240, "src/osmo-pcu", "Osmo-PCU", "osmo-pcu"), ] -vty_command = ["src/osmo-pcu", "-c", "examples/osmo-pcu.cfg"] +vty_command = ["src/osmo-pcu", "-c", "doc/examples/osmo-pcu.cfg"] vty_app = apps[0] -- To view, visit https://gerrit.osmocom.org/10922 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: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe Gerrit-Change-Number: 10922 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 Sep 13 13:04:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:04:07 +0000 Subject: Change in osmo-pcu[master]: Install osmo-pcu.cfg to docdir/examples In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10923 ) Change subject: Install osmo-pcu.cfg to docdir/examples ...................................................................... Install osmo-pcu.cfg to docdir/examples Change-Id: I42938d9abd17575c2e0ce69cc20d44a131f26b6a --- M debian/osmo-pcu.install M doc/examples/Makefile.am 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-pcu.install b/debian/osmo-pcu.install index 1b82e96..9b7eac6 100644 --- a/debian/osmo-pcu.install +++ b/debian/osmo-pcu.install @@ -3,3 +3,4 @@ usr/bin/osmo-pcu usr/include/osmocom/pcu/pcuif_proto.h usr/lib/*/pkgconfig/osmo-pcu.pc +usr/share/doc/osmo-pcu/examples/osmo-pcu/osmo-pcu.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 1500149..0ea13e1 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,4 +1,7 @@ -pcuconfdir = $(sysconfdir)/osmocom -pcuconf_DATA = osmo-pcu.cfg +examples_pcudir = $(docdir)/examples/osmo-pcu +examples_pcu_DATA = osmo-pcu.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-pcu.cfg EXTRA_DIST = osmo-pcu.cfg -- To view, visit https://gerrit.osmocom.org/10923 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: I42938d9abd17575c2e0ce69cc20d44a131f26b6a Gerrit-Change-Number: 10923 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 Sep 13 13:05:35 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 13:05:35 +0000 Subject: Change in gr-gsm[master]: grgsm_channelize: Add ichar data type In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10909 ) Change subject: grgsm_channelize: Add ichar data type ...................................................................... grgsm_channelize: Add ichar data type This is the output format of rtl_sdr and hackrf_transfer and this would allow direct channelization without an additional post processing. Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8 --- M apps/helpers/grgsm_channelize 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize index 9b00bd7..5eaeb3b 100755 --- a/apps/helpers/grgsm_channelize +++ b/apps/helpers/grgsm_channelize @@ -79,6 +79,10 @@ self.blocks_file_source = blocks.file_source(gr.sizeof_short, input_file, False) self.source = blocks.interleaved_short_to_complex(False, False) self.connect((self.blocks_file_source, 0), (self.source, 0)) + elif data_type == "ichar": + self.blocks_file_source = blocks.file_source(gr.sizeof_char, input_file, False) + self.source = blocks.interleaved_char_to_complex(False) + self.connect((self.blocks_file_source, 0), (self.source, 0)) elif data_type == "complex": self.source = blocks.file_source(gr.sizeof_gr_complex, input_file, False) @@ -114,7 +118,7 @@ help="Sample rate of the output capture files [default=%(default)s]") parser.add_argument("-i", "--input_file", dest="input_file", type=str, required=True, help="Path to wideband GSM capture file") - parser.add_argument("-t", "--data_type", dest="data_type", type=str, choices=["complex","ishort"], default="complex", + parser.add_argument("-t", "--data_type", dest="data_type", type=str, choices=["complex","ishort","ichar"], default="complex", help="Type of the input file [default=%(default)s]") parser.add_argument("-d", "--dest_dir", dest="dest_dir", type=str, help="Destination directory - if not given defaults to input file name without extension") -- To view, visit https://gerrit.osmocom.org/10909 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: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8 Gerrit-Change-Number: 10909 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:05:50 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10926 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/10926/5/openbsc/contrib/systemd/osmo-nitb.service File openbsc/contrib/systemd/osmo-nitb.service: https://gerrit.osmocom.org/#/c/10926/5/openbsc/contrib/systemd/osmo-nitb.service at 7 PS5, Line 7: openbsc.cfg > I don't like the naming change here. osmo-nitb.cfg sounds better than openbsc. [?] I did it to match the current installed cfg file. I'll change the osmo-nitb cfg file names in the repo then -- To view, visit https://gerrit.osmocom.org/10926 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: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:05:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:11:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:11:43 +0000 Subject: Change in osmo-gsm-tester[master]: Sanitize existing suite names Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10931 Change subject: Sanitize existing suite names ...................................................................... Sanitize existing suite names When first suites were added, osmo-nitb was used. Then new tests using regular split components were added with "aoip_" prefix. At some point it was clear that osmo-nitb was being deprecated so new tests for split components were added without any prefix, as they are expected to be the default one. Since most current and future development is going to be done for split components, as well as new tests added, it makes sense to move the few old testsuites using osmo-nitb to have all "nitb_" prefix, while keeping the split component tests without prefix as it's the regular network topology. Change-Id: Idea2e053d337548e0e9b1b47441dbb262124f909 --- M example/default-suites.conf D suites/aoip_sms/mo_mt_sms.py D suites/aoip_sms/suite.conf M suites/debug/interactive.py M suites/debug/suite.conf R suites/encryption/register_a5_0_authopt.py R suites/encryption/register_a5_0_authreq.py R suites/encryption/register_a5_1_authreq.py R suites/encryption/suite.conf R suites/nitb_debug/error.py R suites/nitb_debug/fail.py R suites/nitb_debug/fail_raise.py R suites/nitb_debug/interactive.py R suites/nitb_debug/pass.py R suites/nitb_debug/suite.conf R suites/nitb_netreg/register.py R suites/nitb_netreg/register_default.py R suites/nitb_netreg/suite.conf R suites/nitb_smpp/esme_connect_policy_acceptall.py R suites/nitb_smpp/esme_connect_policy_closed.py R suites/nitb_smpp/esme_ms_sms_storeforward.py R suites/nitb_smpp/esme_ms_sms_transaction.py C suites/nitb_smpp/suite.conf A suites/nitb_sms/mo_mt_sms.py R suites/nitb_sms/suite.conf R suites/nitb_ussd/assert_extension.py R suites/nitb_ussd/suite.conf M suites/smpp/esme_connect_policy_acceptall.py M suites/smpp/esme_connect_policy_closed.py M suites/smpp/esme_ms_sms_storeforward.py M suites/smpp/esme_ms_sms_transaction.py M suites/smpp/suite.conf M suites/sms/mo_mt_sms.py M suites/sms/suite.conf M suites/ussd/assert_extension.py M suites/ussd/suite.conf 36 files changed, 287 insertions(+), 299 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/31/10931/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 6b6e1d0..af7e8de 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -1,7 +1,7 @@ +- nitb_sms:sysmo - sms:sysmo -- aoip_sms:sysmo +- nitb_ussd:sysmo - ussd:sysmo -- aoip_ussd:sysmo - 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 @@ -12,10 +12,10 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo +- nitb_sms:trx-b200 - sms:trx-b200 -- aoip_sms:trx-b200 +- nitb_ussd:trx-b200 - ussd:trx-b200 -- aoip_ussd:trx-b200 - 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 @@ -26,10 +26,10 @@ - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 -- aoip_sms:trx-sysmocell5000 +- nitb_ussd:trx-sysmocell5000 - ussd:trx-sysmocell5000 -- aoip_ussd:trx-sysmocell5000 - 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 @@ -40,10 +40,10 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- sms:nanobts -- aoip_sms:nanobts+band-1900 +- nitb_sms:nanobts +- sms:nanobts+band-1900 +- nitb_ussd:nanobts+band-1900 - ussd:nanobts+band-1900 -- aoip_ussd:nanobts+band-1900 - 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 @@ -52,9 +52,9 @@ - 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 +- sms:nanobts+band-900 +- nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 -- aoip_ussd:nanobts+band-900 - 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 @@ -65,6 +65,6 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- nitb_smpp - smpp -- aoip_smpp -- aoip_encryption +- encryption diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py deleted file mode 100755 index 7654ea6..0000000 --- a/suites/aoip_sms/mo_mt_sms.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/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) - -sms = ms_mo.sms_send(ms_mt) -wait(ms_mt.sms_was_received, sms) diff --git a/suites/aoip_sms/suite.conf b/suites/aoip_sms/suite.conf deleted file mode 100644 index 28a81ea..0000000 --- a/suites/aoip_sms/suite.conf +++ /dev/null @@ -1,9 +0,0 @@ -resources: - ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 - bts: - - times: 1 - modem: - - times: 2 - features: - - sms diff --git a/suites/debug/interactive.py b/suites/debug/interactive.py index 595cfd9..98bf174 100755 --- a/suites/debug/interactive.py +++ b/suites/debug/interactive.py @@ -1,23 +1,43 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * - -print('use resources...') -nitb = suite.nitb() +hlr = suite.hlr() bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) + modems = suite.modems(int(prompt('How many modems?'))) -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.start() +bsc.bts_add(bts) +sgsn.bts_add(bts) + +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + bts.start() -wait(nitb.bts_is_connected, bts) +print('Waiting for bts to connect to bsc...') +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() for m in modems: - nitb.subscriber_add(m) - m.connect(nitb.mcc_mnc()) + hlr.subscriber_add(m) + m.connect(msc.mcc_mnc()) while True: - cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd ') + cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd , data-attach, data-wait, data-detach, data-activate') cmd = cmd.strip().lower() if not cmd: @@ -31,15 +51,15 @@ elif 'wait-registered'.startswith(cmd): try: for m in modems: - wait(m.is_connected, nitb.mcc_mnc()) - wait(nitb.subscriber_attached, *modems) + wait(m.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, *modems) except Timeout: print('Timeout while waiting for registration.') elif 'get-registered'.startswith(cmd): - print(nitb.imsi_list_attached()) + print(msc.imsi_list_attached()) print('RESULT: %s' % - ('All modems are registered.' if nitb.subscriber_attached(*modems) + ('All modems are registered.' if msc.subscriber_attached(*modems) else 'Some modem(s) not registered yet.')) elif 'sms'.startswith(cmd): @@ -107,5 +127,34 @@ response = ms.ussd_send(ussd_cmd) print('modem %s: response=%r' % (ms.name(), response)) + elif cmd.startswith('data-attach'): + if len(params) != 1: + print('wrong format') + continue + for ms in modems: + print('modem %s: attach' % ms.name()) + ms.attach() + wait(ms.is_attached) + print('modem %s: attached' % ms.name()) + + elif cmd.startswith('data-detach'): + if len(params) != 1: + print('wrong format') + continue + for ms in modems: + print('modem %s: detach' % ms.name()) + ms.attach() + wait(lambda: not ms.is_attached()) + print('modem %s: detached' % ms.name()) + + elif cmd.startswith('data-activate'): + if len(params) != 1: + print('wrong format') + continue + for ms in modems: + print('modem %s: activate' % ms.name()) + response = ms.activate_context() + print('modem %s: response=%r' % (ms.name(), response)) + else: print('Unknown command: %s' % cmd) diff --git a/suites/debug/suite.conf b/suites/debug/suite.conf index adfc161..2f36e1d 100644 --- a/suites/debug/suite.conf +++ b/suites/debug/suite.conf @@ -1,10 +1,7 @@ resources: ip_address: - - times: 1 + - times: 8 bts: - times: 1 modem: - times: 4 - -defaults: - timeout: 60s diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/encryption/register_a5_0_authopt.py similarity index 100% rename from suites/aoip_encryption/register_a5_0_authopt.py rename to suites/encryption/register_a5_0_authopt.py diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/encryption/register_a5_0_authreq.py similarity index 100% rename from suites/aoip_encryption/register_a5_0_authreq.py rename to suites/encryption/register_a5_0_authreq.py diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/encryption/register_a5_1_authreq.py similarity index 100% rename from suites/aoip_encryption/register_a5_1_authreq.py rename to suites/encryption/register_a5_1_authreq.py diff --git a/suites/aoip_encryption/suite.conf b/suites/encryption/suite.conf similarity index 100% rename from suites/aoip_encryption/suite.conf rename to suites/encryption/suite.conf diff --git a/suites/debug/error.py b/suites/nitb_debug/error.py similarity index 100% rename from suites/debug/error.py rename to suites/nitb_debug/error.py diff --git a/suites/debug/fail.py b/suites/nitb_debug/fail.py similarity index 100% rename from suites/debug/fail.py rename to suites/nitb_debug/fail.py diff --git a/suites/debug/fail_raise.py b/suites/nitb_debug/fail_raise.py similarity index 100% rename from suites/debug/fail_raise.py rename to suites/nitb_debug/fail_raise.py diff --git a/suites/aoip_debug/interactive.py b/suites/nitb_debug/interactive.py similarity index 63% rename from suites/aoip_debug/interactive.py rename to suites/nitb_debug/interactive.py index 98bf174..595cfd9 100755 --- a/suites/aoip_debug/interactive.py +++ b/suites/nitb_debug/interactive.py @@ -1,43 +1,23 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -bts = suite.bts() -pcu = bts.pcu() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -ggsn = suite.ggsn() -sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) +print('use resources...') +nitb = suite.nitb() +bts = suite.bts() modems = suite.modems(int(prompt('How many modems?'))) -bsc.bts_add(bts) -sgsn.bts_add(bts) - -hlr.start() -stp.start() -ggsn.start() -sgsn.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() - +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() bts.start() -print('Waiting for bts to connect to bsc...') -wait(bsc.bts_is_connected, bts) -print('Waiting for bts to be ready...') -wait(bts.ready_for_pcu) -pcu.start() +wait(nitb.bts_is_connected, bts) for m in modems: - hlr.subscriber_add(m) - m.connect(msc.mcc_mnc()) + nitb.subscriber_add(m) + m.connect(nitb.mcc_mnc()) while True: - cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd , data-attach, data-wait, data-detach, data-activate') + cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd ') cmd = cmd.strip().lower() if not cmd: @@ -51,15 +31,15 @@ elif 'wait-registered'.startswith(cmd): try: for m in modems: - wait(m.is_connected, msc.mcc_mnc()) - wait(msc.subscriber_attached, *modems) + wait(m.is_connected, nitb.mcc_mnc()) + wait(nitb.subscriber_attached, *modems) except Timeout: print('Timeout while waiting for registration.') elif 'get-registered'.startswith(cmd): - print(msc.imsi_list_attached()) + print(nitb.imsi_list_attached()) print('RESULT: %s' % - ('All modems are registered.' if msc.subscriber_attached(*modems) + ('All modems are registered.' if nitb.subscriber_attached(*modems) else 'Some modem(s) not registered yet.')) elif 'sms'.startswith(cmd): @@ -127,34 +107,5 @@ response = ms.ussd_send(ussd_cmd) print('modem %s: response=%r' % (ms.name(), response)) - elif cmd.startswith('data-attach'): - if len(params) != 1: - print('wrong format') - continue - for ms in modems: - print('modem %s: attach' % ms.name()) - ms.attach() - wait(ms.is_attached) - print('modem %s: attached' % ms.name()) - - elif cmd.startswith('data-detach'): - if len(params) != 1: - print('wrong format') - continue - for ms in modems: - print('modem %s: detach' % ms.name()) - ms.attach() - wait(lambda: not ms.is_attached()) - print('modem %s: detached' % ms.name()) - - elif cmd.startswith('data-activate'): - if len(params) != 1: - print('wrong format') - continue - for ms in modems: - print('modem %s: activate' % ms.name()) - response = ms.activate_context() - print('modem %s: response=%r' % (ms.name(), response)) - else: print('Unknown command: %s' % cmd) diff --git a/suites/debug/pass.py b/suites/nitb_debug/pass.py similarity index 100% rename from suites/debug/pass.py rename to suites/nitb_debug/pass.py diff --git a/suites/aoip_debug/suite.conf b/suites/nitb_debug/suite.conf similarity index 63% rename from suites/aoip_debug/suite.conf rename to suites/nitb_debug/suite.conf index 2f36e1d..adfc161 100644 --- a/suites/aoip_debug/suite.conf +++ b/suites/nitb_debug/suite.conf @@ -1,7 +1,10 @@ resources: ip_address: - - times: 8 + - times: 1 bts: - times: 1 modem: - times: 4 + +defaults: + timeout: 60s diff --git a/suites/netreg/register.py b/suites/nitb_netreg/register.py similarity index 100% rename from suites/netreg/register.py rename to suites/nitb_netreg/register.py diff --git a/suites/netreg/register_default.py b/suites/nitb_netreg/register_default.py similarity index 100% rename from suites/netreg/register_default.py rename to suites/nitb_netreg/register_default.py diff --git a/suites/netreg/suite.conf b/suites/nitb_netreg/suite.conf similarity index 100% rename from suites/netreg/suite.conf rename to suites/nitb_netreg/suite.conf diff --git a/suites/aoip_smpp/esme_connect_policy_acceptall.py b/suites/nitb_smpp/esme_connect_policy_acceptall.py similarity index 84% rename from suites/aoip_smpp/esme_connect_policy_acceptall.py rename to suites/nitb_smpp/esme_connect_policy_acceptall.py index 168b4f3..904226b 100755 --- a/suites/aoip_smpp/esme_connect_policy_acceptall.py +++ b/suites/nitb_smpp/esme_connect_policy_acceptall.py @@ -6,11 +6,8 @@ from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -mgw_msc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -smsc = msc.smsc +nitb = suite.nitb() +smsc = nitb.smsc esme = suite.esme() # Here we deliberately omit calling smsc.esme_add() to avoid having it included @@ -18,10 +15,7 @@ smsc.set_smsc_policy(smsc.SMSC_POLICY_ACCEPT_ALL) esme.set_smsc(smsc) -stp.start() -hlr.start() -msc.start() -mgw_msc.start() +nitb.start() # Due to accept-all policy, connect() should work even if we didn't previously # configure the esme in the smsc, no matter the system_id / password we use. diff --git a/suites/aoip_smpp/esme_connect_policy_closed.py b/suites/nitb_smpp/esme_connect_policy_closed.py similarity index 89% rename from suites/aoip_smpp/esme_connect_policy_closed.py rename to suites/nitb_smpp/esme_connect_policy_closed.py index 487e5a4..eaabb3d 100755 --- a/suites/aoip_smpp/esme_connect_policy_closed.py +++ b/suites/nitb_smpp/esme_connect_policy_closed.py @@ -11,13 +11,8 @@ SMPP_ESME_RINVPASWD = 0x0000000E SMPP_ESME_RINVSYSID = 0x0000000F -hlr = suite.hlr() -bts = suite.bts() -mgw_msc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -smsc = msc.smsc - +nitb = suite.nitb() +smsc = nitb.smsc esme = suite.esme() esme_no_pwd = suite.esme() esme_no_pwd.set_password('') @@ -26,10 +21,7 @@ smsc.esme_add(esme) smsc.esme_add(esme_no_pwd) -stp.start() -hlr.start() -msc.start() -mgw_msc.start() +nitb.start() log('Test with correct credentials (no password)') esme_no_pwd.connect() diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/nitb_smpp/esme_ms_sms_storeforward.py similarity index 63% rename from suites/aoip_smpp/esme_ms_sms_storeforward.py rename to suites/nitb_smpp/esme_ms_sms_storeforward.py index 681bc29..391a040 100755 --- a/suites/aoip_smpp/esme_ms_sms_storeforward.py +++ b/suites/nitb_smpp/esme_ms_sms_storeforward.py @@ -12,46 +12,34 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -hlr = suite.hlr() +nitb = suite.nitb() 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) -bsc.bts_add(bts) - ms = suite.modem() esme = suite.esme() -msc.smsc.esme_add(esme) -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.smsc.esme_add(esme) +nitb.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(nitb.bts_is_connected, bts) esme.connect() -hlr.subscriber_add(ms) +nitb.subscriber_add(ms) wrong_msisdn = ms.msisdn + esme.msisdn -print('sending sms with wrong msisdn %s, it will be stored but not delivered' % wrong_msisdn) +print('sending sms with wrong msisdn %s, it will fail' % wrong_msisdn) msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest') -# Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR -# esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) -umref_wrong = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) +esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) print('sending sms, it will be stored...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message') umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) print('MS registers and will receive the SMS...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +ms.connect(nitb.mcc_mnc()) +wait(ms.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms) wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) @@ -62,8 +50,4 @@ wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) - -print('Asserting the sms with wrong msisdn was not delivered', umref_wrong) -assert not esme.receipt_was_received(umref_wrong) - esme.disconnect() diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/nitb_smpp/esme_ms_sms_transaction.py similarity index 74% rename from suites/aoip_smpp/esme_ms_sms_transaction.py rename to suites/nitb_smpp/esme_ms_sms_transaction.py index 16b01cc..adc9dae 100755 --- a/suites/aoip_smpp/esme_ms_sms_transaction.py +++ b/suites/nitb_smpp/esme_ms_sms_transaction.py @@ -10,36 +10,26 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -hlr = suite.hlr() +nitb = suite.nitb() 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) -bsc.bts_add(bts) - ms = suite.modem() esme = suite.esme() -msc.smsc.esme_add(esme) -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.smsc.esme_add(esme) +nitb.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(nitb.bts_is_connected, bts) esme.connect() -hlr.subscriber_add(ms) -ms.connect(msc.mcc_mnc()) +nitb.subscriber_add(ms) +ms.connect(nitb.mcc_mnc()) ms.log_info() print('waiting for modem to attach...') -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +wait(ms.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms) print('sending first sms...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message') diff --git a/suites/aoip_smpp/suite.conf b/suites/nitb_smpp/suite.conf similarity index 73% copy from suites/aoip_smpp/suite.conf copy to suites/nitb_smpp/suite.conf index 61e7015..eb5dc01 100644 --- a/suites/aoip_smpp/suite.conf +++ b/suites/nitb_smpp/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 + - times: 1 bts: - times: 1 modem: diff --git a/suites/nitb_sms/mo_mt_sms.py b/suites/nitb_sms/mo_mt_sms.py new file mode 100755 index 0000000..10897ff --- /dev/null +++ b/suites/nitb_sms/mo_mt_sms.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +nitb = suite.nitb() +bts = suite.bts() +ms_mo = suite.modem() +ms_mt = suite.modem() + +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() +bts.start() +wait(nitb.bts_is_connected, bts) + +nitb.subscriber_add(ms_mo) +nitb.subscriber_add(ms_mt) + +ms_mo.connect(nitb.mcc_mnc()) +ms_mt.connect(nitb.mcc_mnc()) + +ms_mo.log_info() +ms_mt.log_info() + +print('waiting for modems to attach...') +wait(ms_mo.is_connected, nitb.mcc_mnc()) +wait(ms_mt.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms_mo, ms_mt) + +sms = ms_mo.sms_send(ms_mt) +wait(ms_mt.sms_was_received, sms) diff --git a/suites/aoip_smpp/suite.conf b/suites/nitb_sms/suite.conf similarity index 73% rename from suites/aoip_smpp/suite.conf rename to suites/nitb_sms/suite.conf index 61e7015..485402b 100644 --- a/suites/aoip_smpp/suite.conf +++ b/suites/nitb_sms/suite.conf @@ -1,10 +1,10 @@ resources: ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 + - times: 1 bts: - times: 1 modem: - - times: 1 + - times: 2 features: - sms diff --git a/suites/aoip_ussd/assert_extension.py b/suites/nitb_ussd/assert_extension.py similarity index 63% rename from suites/aoip_ussd/assert_extension.py rename to suites/nitb_ussd/assert_extension.py index 475de09..8ccab2d 100755 --- a/suites/aoip_ussd/assert_extension.py +++ b/suites/nitb_ussd/assert_extension.py @@ -3,36 +3,24 @@ USSD_COMMAND_GET_EXTENSION = '*#100#' -hlr = suite.hlr() +nitb = suite.nitb() 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 = suite.modem() -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() - -bsc.bts_add(bts) -bsc.start() - +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(nitb.bts_is_connected, bts) -hlr.subscriber_add(ms) +nitb.subscriber_add(ms) -ms.connect(msc.mcc_mnc()) - +ms.connect(nitb.mcc_mnc()) ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +wait(ms.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms) # ofono (qmi) currently changes state to 'registered' jut after sending # 'Location Update Request', but before receiving 'Location Updating Accept'. @@ -46,5 +34,4 @@ print('Sending ussd code %s' % USSD_COMMAND_GET_EXTENSION) response = ms.ussd_send(USSD_COMMAND_GET_EXTENSION) -log('got ussd response: %r' % repr(response)) -assert response.endswith(' ' + ms.msisdn) +assert ' ' + ms.msisdn + '\r' in response diff --git a/suites/aoip_ussd/suite.conf b/suites/nitb_ussd/suite.conf similarity index 69% rename from suites/aoip_ussd/suite.conf rename to suites/nitb_ussd/suite.conf index 460147a..232a5d8 100644 --- a/suites/aoip_ussd/suite.conf +++ b/suites/nitb_ussd/suite.conf @@ -1,9 +1,12 @@ resources: ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 + - times: 1 bts: - times: 1 modem: - times: 1 features: - ussd + +defaults: + timeout: 60s diff --git a/suites/smpp/esme_connect_policy_acceptall.py b/suites/smpp/esme_connect_policy_acceptall.py index 904226b..168b4f3 100755 --- a/suites/smpp/esme_connect_policy_acceptall.py +++ b/suites/smpp/esme_connect_policy_acceptall.py @@ -6,8 +6,11 @@ from osmo_gsm_tester.testenv import * -nitb = suite.nitb() -smsc = nitb.smsc +hlr = suite.hlr() +mgw_msc = suite.mgw() +stp = suite.stp() +msc = suite.msc(hlr, mgw_msc, stp) +smsc = msc.smsc esme = suite.esme() # Here we deliberately omit calling smsc.esme_add() to avoid having it included @@ -15,7 +18,10 @@ smsc.set_smsc_policy(smsc.SMSC_POLICY_ACCEPT_ALL) esme.set_smsc(smsc) -nitb.start() +stp.start() +hlr.start() +msc.start() +mgw_msc.start() # Due to accept-all policy, connect() should work even if we didn't previously # configure the esme in the smsc, no matter the system_id / password we use. diff --git a/suites/smpp/esme_connect_policy_closed.py b/suites/smpp/esme_connect_policy_closed.py index eaabb3d..487e5a4 100755 --- a/suites/smpp/esme_connect_policy_closed.py +++ b/suites/smpp/esme_connect_policy_closed.py @@ -11,8 +11,13 @@ SMPP_ESME_RINVPASWD = 0x0000000E SMPP_ESME_RINVSYSID = 0x0000000F -nitb = suite.nitb() -smsc = nitb.smsc +hlr = suite.hlr() +bts = suite.bts() +mgw_msc = suite.mgw() +stp = suite.stp() +msc = suite.msc(hlr, mgw_msc, stp) +smsc = msc.smsc + esme = suite.esme() esme_no_pwd = suite.esme() esme_no_pwd.set_password('') @@ -21,7 +26,10 @@ smsc.esme_add(esme) smsc.esme_add(esme_no_pwd) -nitb.start() +stp.start() +hlr.start() +msc.start() +mgw_msc.start() log('Test with correct credentials (no password)') esme_no_pwd.connect() diff --git a/suites/smpp/esme_ms_sms_storeforward.py b/suites/smpp/esme_ms_sms_storeforward.py index 391a040..681bc29 100755 --- a/suites/smpp/esme_ms_sms_storeforward.py +++ b/suites/smpp/esme_ms_sms_storeforward.py @@ -12,34 +12,46 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -nitb = suite.nitb() +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) +bsc.bts_add(bts) + ms = suite.modem() esme = suite.esme() +msc.smsc.esme_add(esme) -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.smsc.esme_add(esme) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) esme.connect() -nitb.subscriber_add(ms) +hlr.subscriber_add(ms) wrong_msisdn = ms.msisdn + esme.msisdn -print('sending sms with wrong msisdn %s, it will fail' % wrong_msisdn) +print('sending sms with wrong msisdn %s, it will be stored but not delivered' % wrong_msisdn) msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest') -esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) +# Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR +# esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) +umref_wrong = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) print('sending sms, it will be stored...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message') umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) print('MS registers and will receive the SMS...') -ms.connect(nitb.mcc_mnc()) -wait(ms.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms) +ms.connect(msc.mcc_mnc()) +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) @@ -50,4 +62,8 @@ wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) + +print('Asserting the sms with wrong msisdn was not delivered', umref_wrong) +assert not esme.receipt_was_received(umref_wrong) + esme.disconnect() diff --git a/suites/smpp/esme_ms_sms_transaction.py b/suites/smpp/esme_ms_sms_transaction.py index adc9dae..16b01cc 100755 --- a/suites/smpp/esme_ms_sms_transaction.py +++ b/suites/smpp/esme_ms_sms_transaction.py @@ -10,26 +10,36 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -nitb = suite.nitb() +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) +bsc.bts_add(bts) + ms = suite.modem() esme = suite.esme() +msc.smsc.esme_add(esme) -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.smsc.esme_add(esme) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) esme.connect() -nitb.subscriber_add(ms) -ms.connect(nitb.mcc_mnc()) +hlr.subscriber_add(ms) +ms.connect(msc.mcc_mnc()) ms.log_info() print('waiting for modem to attach...') -wait(ms.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms) +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) print('sending first sms...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message') diff --git a/suites/smpp/suite.conf b/suites/smpp/suite.conf index eb5dc01..61e7015 100644 --- a/suites/smpp/suite.conf +++ b/suites/smpp/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 1 + - times: 6 # msc, bsc, hlr, stp, mgw*2 bts: - times: 1 modem: diff --git a/suites/sms/mo_mt_sms.py b/suites/sms/mo_mt_sms.py index 10897ff..7654ea6 100755 --- a/suites/sms/mo_mt_sms.py +++ b/suites/sms/mo_mt_sms.py @@ -1,30 +1,41 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -nitb = suite.nitb() +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() -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() + +bsc.bts_add(bts) +bsc.start() + bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) -nitb.subscriber_add(ms_mo) -nitb.subscriber_add(ms_mt) +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) -ms_mo.connect(nitb.mcc_mnc()) -ms_mt.connect(nitb.mcc_mnc()) +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, nitb.mcc_mnc()) -wait(ms_mt.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms_mo, ms_mt) +wait(ms_mo.is_connected, msc.mcc_mnc()) +wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms_mo, ms_mt) sms = ms_mo.sms_send(ms_mt) wait(ms_mt.sms_was_received, sms) diff --git a/suites/sms/suite.conf b/suites/sms/suite.conf index 485402b..28a81ea 100644 --- a/suites/sms/suite.conf +++ b/suites/sms/suite.conf @@ -1,12 +1,9 @@ resources: ip_address: - - times: 1 + - times: 6 # msc, bsc, hlr, stp, mgw*2 bts: - times: 1 modem: - times: 2 features: - sms - -defaults: - timeout: 60s diff --git a/suites/ussd/assert_extension.py b/suites/ussd/assert_extension.py index 8ccab2d..475de09 100755 --- a/suites/ussd/assert_extension.py +++ b/suites/ussd/assert_extension.py @@ -3,24 +3,36 @@ USSD_COMMAND_GET_EXTENSION = '*#100#' -nitb = suite.nitb() +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 = suite.modem() -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() + +bsc.bts_add(bts) +bsc.start() + bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) -nitb.subscriber_add(ms) +hlr.subscriber_add(ms) -ms.connect(nitb.mcc_mnc()) +ms.connect(msc.mcc_mnc()) + ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms) +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) # ofono (qmi) currently changes state to 'registered' jut after sending # 'Location Update Request', but before receiving 'Location Updating Accept'. @@ -34,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) diff --git a/suites/ussd/suite.conf b/suites/ussd/suite.conf index 232a5d8..460147a 100644 --- a/suites/ussd/suite.conf +++ b/suites/ussd/suite.conf @@ -1,12 +1,9 @@ resources: ip_address: - - times: 1 + - times: 6 # msc, bsc, hlr, stp, mgw*2 bts: - times: 1 modem: - times: 1 features: - ussd - -defaults: - timeout: 60s -- To view, visit https://gerrit.osmocom.org/10931 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: Idea2e053d337548e0e9b1b47441dbb262124f909 Gerrit-Change-Number: 10931 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 Sep 13 13:29:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:29:19 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom 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/10926 to look at the new patch set (#6). Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg R openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/smpp_test_runner.py M openbsc/tests/vty_test_runner.py 15 files changed, 34 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/10926/6 -- To view, visit https://gerrit.osmocom.org/10926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 6 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 Sep 13 13:45:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Sep 2018 13:45:33 +0000 Subject: Change in osmo-ci[master]: New script to verify PKG_CHECK_MODULES Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/10932 Change subject: New script to verify PKG_CHECK_MODULES ...................................................................... New script to verify PKG_CHECK_MODULES Work in progress, see the Redmine issue. Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65 Relates: OS#2642 --- A scripts/dependency-check/dependency-check.py A scripts/dependency-check/jenkins.sh 2 files changed, 199 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/10932/1 diff --git a/scripts/dependency-check/dependency-check.py b/scripts/dependency-check/dependency-check.py new file mode 100755 index 0000000..6e7656d --- /dev/null +++ b/scripts/dependency-check/dependency-check.py @@ -0,0 +1,196 @@ +#!/usr/bin/env python3 +from collections import OrderedDict +import sys +import os +import subprocess + + +def parse_error(line_num, message): + print("ERROR: configure.ac line " + str(line_num) + ": " + message) + sys.exit(1) + + +def parse_repository(gitdir, program, library, line_num): + repos = {"libosmocore": ["libosmocodec", + "libosmocoding", + "libosmoctrl", + "libosmogb", + "libosmogsm", + "libosmosim", + "libosmovty"], + "libosmo-abis": ["libosmoabis", + "libosmotrau"], + "libosmo-sccp": ["libosmo-mtp", + "libosmo-sigtran", + "libosmo-xua"]} + + for repo, libraries in repos.items(): + if library in libraries: + print(" * " + library + " (part of " + repo + ")") + return repo + + print(" * " + library) + return library + + +def parse_condition(line): + # Only look at PKG_CHECK_MODULES lines, like these: + # PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) + # PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd) + if "PKG_CHECK_MODULES" not in line: + return + + # Extract the condition + ret = line.split(",")[1].split(")")[0].strip() + + # Only look at Osmocom libraries + if ret.startswith("libosmo"): + return ret + + +def parse_library_version(line_num, condition): + split = list(filter(None, condition.split(" "))) + if len(split) != 3: + parse_error(line_num, "invalid condition format, expected something" + " like 'libosmocore >= 0.10.0' but got: '" + + condition + "'") + library = split[0] + operator = split[1] + version = split[2] + + # Right operator + if operator == ">=": + return (library, version) + + # Wrong operator + parse_error(line_num, "invalid operator, expected '>=' but got: '" + + operator + "'") + + +def parse_configure_ac(gitdir, program): + # Read configure.ac + path = gitdir + "/" + program + "/configure.ac" + with open(path) as handle: + lines = handle.readlines() + + # Parse the file into ret + ret = {} + for i in range(0, len(lines)): + # Parse the line + condition = parse_condition(lines[i]) + if not condition: + continue + (library, version) = parse_library_version(i, condition) + + # Add to ret (with duplicate check) + if library in ret and version is not ret[library]: + parse_error(i, "found multiple PKG_CHECK_MODULES statements for " + + library + ", and they have different versions!") + repository = parse_repository(gitdir, program, library, i) + ret[repository] = version + return ret + + +def clone(gitdir, program, version): + if not os.path.exists(gitdir + "/" + program): + url = "git://git.osmocom.org/" + program + print("Cloning git repo: " + url) + subprocess.run(["git", "-C", gitdir, "clone", "-q", url], + check=True) + subprocess.run(["git", "-C", gitdir + "/" + program, "checkout", version, + "-q"], check=True) + + +def dependstack_generate(gitdir, initial): + """ Clone an Osomocom git repository, parse its configure.ac and + recurse. + + :returns: ... + """ + dependstack = OrderedDict() + parsestack = OrderedDict({initial: "master"}) + while len(parsestack): + # Pop program from parsestack + program, version = next(iter(parsestack.items())) + del parsestack[program] + + # Add to dependstack (or skip when it's there already) + if program in dependstack: + continue + + # Add the program's dependencies to the parsestack + print("Looking at " + program + ":" + version) + clone(gitdir, program, version) + depends = parse_configure_ac(gitdir, program) + parsestack.update(depends) + + # Add the program to the dependstack + dependstack[program] = {"version": version, "depends": depends} + + return dependstack + + +def dependstack_print(dependstack): + print("Dependency graph:") + for program, data in dependstack.items(): + version = data["version"] + depends = data["depends"] + print(" * " + program + ":" + version + " depends: " + str(depends)) + + +def buildstack_next(gitdir, dependstack, done): + for program, data in dependstack.items(): + if program in done: + continue + depends_done = True + for depend in data["depends"]: + if depend not in done: + depends_done = False + break + if depends_done: + return program, data["version"] + + print("ERROR: can't figure out how to build the rest!") + print("Build order so far: " + str(done)) + sys.exit(1) + + +def buildstack_generate(gitdir, dependstack): + ret = OrderedDict() + count = len(dependstack.keys()) + while len(ret) != count: + program, version = buildstack_next(gitdir, dependstack, ret) + ret[program] = version + return ret + + +def buildstack_print(buildstack): + print("Build order:") + for program, version in buildstack.items(): + print(" * " + program + ":" + version) + + +def buildstack_build(gitdir, buildstack): + for program, version in buildstack.items(): + print("Building " + program + ":" + version) + os.chdir(gitdir + "/" + program) + commands = [["autoreconf", "-fi"], + ["make"], + ["make", "check"], # needed? + ["sudo", "make", "install"], + ["sudo", "ldconfig"]] + for command in commands: + print(" + " + " ".join(command)) + subprocess.run(command, check=True) + + +def main(): + gitdir = "/home/user/code/" + dependstack = dependstack_generate(gitdir, "osmo-bts") + dependstack_print(dependstack) + buildstack = buildstack_generate(gitdir, dependstack) + buildstack_print(buildstack) + buildstack_build(gitdir, buildstack) + + +main() diff --git a/scripts/dependency-check/jenkins.sh b/scripts/dependency-check/jenkins.sh new file mode 100755 index 0000000..57f06f3 --- /dev/null +++ b/scripts/dependency-check/jenkins.sh @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +echo "TODO" -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:46:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:46:27 +0000 Subject: Change in osmo-trx[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10924 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10924 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: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5 Gerrit-Change-Number: 10924 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:46: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 Sep 13 13:46:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:46:43 +0000 Subject: Change in osmo-trx[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10900 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10900 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: Ia1a4fb62dee35737ece1f3501f352501eba2449e Gerrit-Change-Number: 10900 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:46: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 Sep 13 13:47:06 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 13 Sep 2018 13:47:06 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove redundant unit from freq_offset variable name Message-ID: Piotr Krysik has uploaded this change for review. ( https://gerrit.osmocom.org/10933 Change subject: apps/grgsm_trx: remove redundant unit from freq_offset variable name ...................................................................... apps/grgsm_trx: remove redundant unit from freq_offset variable name Frequency is always in Hz so there is no need to add that information in the variable name. Change-Id: I509771c3fe072069a680f66b0763ae6825f6d529 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/33/10933/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index b53d12a..efb9c24 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -52,7 +52,7 @@ self.phy_tx_gain = argv.tx_gain self.phy_rx_antenna = argv.rx_antenna self.phy_tx_antenna = argv.tx_antenna - self.phy_freq_offset_hz = argv.freq_offset + self.phy_freq_offset = argv.freq_offset self.phy_ppm = argv.ppm # Set up signal handlers @@ -63,7 +63,7 @@ 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.phy_freq_offset_hz, self.bind_addr, + self.phy_freq_offset, self.bind_addr, self.remote_addr, self.base_port) # Power measurement emulation diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index a9b0358..85970a9 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -85,7 +85,7 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - phy_freq_offset_hz, trx_bind_addr, + phy_freq_offset, trx_bind_addr, trx_remote_addr, trx_base_port): print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" @@ -97,7 +97,7 @@ self.rx_gain = phy_rx_gain self.tx_gain = phy_tx_gain self.ppm = phy_ppm - self.freq_offset_hz = phy_freq_offset_hz + self.freq_offset = phy_freq_offset gr.top_block.__init__(self, "GR-GSM TRX") @@ -279,19 +279,19 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): - fc += self.freq_offset_hz + fc += self.freq_offset print("[#] Shifting RX freq. to %s (offset is %s)" % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + eng_notation.num_to_str(self.freq_offset))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): - fc += self.freq_offset_hz + fc += self.freq_offset print("[#] Shifting TX freq. to %s (offset is %s)" % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + eng_notation.num_to_str(self.freq_offset))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/10933 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: I509771c3fe072069a680f66b0763ae6825f6d529 Gerrit-Change-Number: 10933 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:49:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:49:19 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove redundant unit from freq_offset variable name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10933 ) Change subject: apps/grgsm_trx: remove redundant unit from freq_offset variable name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10933 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: I509771c3fe072069a680f66b0763ae6825f6d529 Gerrit-Change-Number: 10933 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:49:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:50:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:50:05 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10926 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10926 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: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:50:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:50:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:50:40 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9257 ) Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... Patch Set 16: Code-Review+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: comment Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 13 Sep 2018 13:50: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 Sep 13 13:51:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:51:37 +0000 Subject: Change in osmo-sgsn[master]: tests: remove gmm unit tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9258 ) 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(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 0e5267b..3e86266 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -925,166 +925,6 @@ cleanup_test(); } -/* - * Test the GMM Attach procedure - */ -static void test_gmm_attach(int retry) -{ - struct gprs_ra_id raid = { 0, }; - struct sgsn_mm_ctx *ctx = NULL; - struct sgsn_mm_ctx *ictx; - uint32_t ptmsi1; - uint32_t foreign_tlli; - uint32_t local_tlli = 0; - struct gprs_llc_lle *lle; - - /* DTAP - Attach Request */ - /* The P-TMSI is not known by the SGSN */ - static const unsigned char attach_req[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, 0x05, 0xf4, - 0xfb, 0xc5, 0x46, 0x79, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, - 0x19, 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, 0x60, - 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, 0x80, 0xba, 0xc8, - 0xc6, 0x62, 0x00, 0x60, 0x80, 0x00 - }; - - /* DTAP - Identity Response IMEI */ - static const unsigned char ident_resp_imei[] = { - 0x08, 0x16, 0x08, 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, - 0x56 - }; - - /* DTAP - Identity Response IMSI */ - static const unsigned char ident_resp_imsi[] = { - 0x08, 0x16, 0x08, 0x19, 0x32, 0x54, 0x76, 0x98, 0x10, 0x32, - 0x54 - }; - - /* DTAP - Authentication and Ciphering Resp */ - static const unsigned char auth_ciph_resp[] = { - 0x08, 0x13, 0x00, 0x22, 0x51, 0xe5, 0x51, 0xe5, 0x23, 0x09, - 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x01 - }; - - /* DTAP - Attach Complete */ - static const unsigned char attach_compl[] = { - 0x08, 0x03 - }; - - /* DTAP - Detach Request (MO) */ - /* normal detach, power_off = 0 */ - static const unsigned char detach_req[] = { - 0x08, 0x05, 0x01, 0x18, 0x05, 0xf4, 0xeb, 0x8b, - 0x45, 0x67, 0x19, 0x03, 0xb9, 0x97, 0xcb - }; - - printf("Testing GMM attach%s\n", retry ? " with retry" : ""); - - foreign_tlli = gprs_tmsi2tlli(0xc0000023, TLLI_FOREIGN); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - lle = gprs_lle_get_or_create(foreign_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - - ctx = sgsn_mm_ctx_by_tlli(foreign_tlli, &raid); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - - /* we expect an identity request (IMEI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - /* inject the identity response (IMEI) */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - ident_resp_imei, ARRAY_SIZE(ident_resp_imei)); - - /* we expect an identity request (IMSI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - /* inject the identity response (IMSI) */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - ident_resp_imsi, ARRAY_SIZE(ident_resp_imsi)); - - /* check that the MM context has not been removed due to a failed - * authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid)); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - -retry_attach_req: - - if (retry && sgsn_tx_counter == 0) { - fprintf(stderr, "Retrying attach request\n"); - /* re-inject the attach request */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - } - - if (ctx->auth_state == SGSN_AUTH_AUTHENTICATE && sgsn_tx_counter == 1) { - /* we got an auth & ciph request */ - - /* inject the auth & ciph response */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - auth_ciph_resp, ARRAY_SIZE(auth_ciph_resp)); - - /* check that the MM context has not been removed due to a - * failed authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid)); - if (ctx->subscr && ctx->subscr->sgsn_data->msisdn_len > 0) - OSMO_ASSERT(strcmp(ctx->msisdn, "+49166213323") == 0); - } - - if (retry && sgsn_tx_counter == 0) - goto retry_attach_req; - - /* we expect an attach accept/reject */ - OSMO_ASSERT(sgsn_tx_counter == 1); - ptmsi1 = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(ptmsi1 != GSM_RESERVED_TMSI); - - /* this has been randomly assigned by the SGSN */ - local_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - - /* inject the attach complete */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - attach_compl, ARRAY_SIZE(attach_compl)); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - /* inject the detach */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - detach_req, ARRAY_SIZE(detach_req)); - - /* verify that things are gone */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - ictx = sgsn_mm_ctx_by_tlli(local_tlli, &raid); - OSMO_ASSERT(!ictx); - - cleanup_test(); -} - -static void test_gmm_attach_acl(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; - sgsn_acl_add("123456789012345", &sgsn->cfg); - printf("Auth policy 'closed': "); - test_gmm_attach(0); - sgsn_acl_del("123456789012345", &sgsn->cfg); - - sgsn->cfg.auth_policy = saved_auth_policy; - - cleanup_test(); -} - int my_subscr_request_update_location(struct sgsn_mm_ctx *mmctx) { int rc; @@ -1103,30 +943,6 @@ return 0; } -static void test_gmm_attach_subscr(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_location; - subscr_request_auth_info_cb = my_subscr_request_auth_info; - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - - printf("Auth policy 'remote': "); - test_gmm_attach(0); - gprs_subscr_put(subscr); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - - cleanup_test(); -} - int my_subscr_request_auth_info_fake_auth(struct sgsn_mm_ctx *mmctx, const uint8_t *auts, const uint8_t *auts_rand) { @@ -1138,32 +954,6 @@ return 0; } -static void test_gmm_attach_subscr_fake_auth(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_location; - subscr_request_auth_info_cb = my_subscr_request_auth_info_fake_auth; - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - sgsn->cfg.require_authentication = 1; - sgsn->cfg.require_update_location = 1; - - printf("Auth policy 'remote', auth faked: "); - test_gmm_attach(0); - gprs_subscr_put(subscr); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - - cleanup_test(); -} - int my_subscr_request_auth_info_real_auth(struct sgsn_mm_ctx *mmctx, const uint8_t *auts, const uint8_t *auts_rand) { struct gsm_auth_tuple at = { @@ -1181,33 +971,6 @@ return 0; } -static void test_gmm_attach_subscr_real_auth(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_location; - subscr_request_auth_info_cb = my_subscr_request_auth_info_real_auth; - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - sgsn->cfg.require_authentication = 1; - sgsn->cfg.require_update_location = 1; - - printf("Auth policy 'remote', triplet based auth: "); - - test_gmm_attach(0); - gprs_subscr_put(subscr); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - - cleanup_test(); -} - #define TEST_GSUP_IMSI_LONG_IE 0x01, 0x08, \ 0x21, 0x43, 0x65, 0x87, 0x09, 0x21, 0x43, 0xf5 @@ -1269,39 +1032,6 @@ return rx_gsup_message(update_location_res, sizeof(update_location_res)); }; - -static void test_gmm_attach_subscr_gsup_auth(int retry) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_gsup_auth; - subscr_request_auth_info_cb = my_subscr_request_auth_info_gsup_auth; - if (retry) { - upd_loc_skip = 3; - auth_info_skip = 3; - } - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - sgsn->cfg.require_authentication = 1; - sgsn->cfg.require_update_location = 1; - gprs_subscr_put(subscr); - - printf("Auth policy 'remote', GSUP based auth: "); - test_gmm_attach(retry); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - upd_loc_skip = 0; - auth_info_skip = 0; - - cleanup_test(); -} - int my_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) { struct osmo_gsup_message to_peer = {0}; @@ -1353,38 +1083,6 @@ return 0; }; -static void test_gmm_attach_subscr_real_gsup_auth(int retry) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - gsup_client_send_cb = my_gsup_client_send; - - sgsn->gsup_client = talloc_zero(tall_bsc_ctx, struct gsup_client); - - if (retry) { - upd_loc_skip = 3; - auth_info_skip = 3; - } - - printf("Auth policy 'remote', real GSUP based auth: "); - test_gmm_attach(retry); - - subscr = gprs_subscr_get_by_imsi("123456789012345"); - OSMO_ASSERT(subscr == NULL); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - gsup_client_send_cb = __real_gsup_client_send; - upd_loc_skip = 0; - auth_info_skip = 0; - talloc_free(sgsn->gsup_client); - sgsn->gsup_client = NULL; - - cleanup_test(); -} - /* * Test the GMM Rejects */ @@ -1639,513 +1337,6 @@ cleanup_test(); } -/* - * Test the dynamic allocation of P-TMSIs - */ -static void test_gmm_ptmsi_allocation(void) -{ - struct gprs_ra_id raid = { .mnc=332, .mcc=112, .lac=16464, .rac=96}; - struct sgsn_mm_ctx *ctx = NULL; - struct sgsn_mm_ctx *ictx; - uint32_t foreign_tlli; - uint32_t ptmsi1; - uint32_t ptmsi2; - uint32_t received_ptmsi; - uint32_t old_ptmsi; - uint32_t local_tlli = 0; - struct gprs_llc_lle *lle; - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - - /* DTAP - Attach Request (IMSI 12131415161718) */ - static const unsigned char attach_req[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, - 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, 0x19, - 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, - 0x60, 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, - 0x80, 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, - 0x00, - }; - - /* DTAP - Identity Response IMEI */ - static const unsigned char ident_resp_imei[] = { - 0x08, 0x16, 0x08, 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, - 0x56 - }; - - /* DTAP - Attach Complete */ - static const unsigned char attach_compl[] = { - 0x08, 0x03 - }; - - /* DTAP - Routing Area Update Request */ - static const unsigned char ra_upd_req[] = { - 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, 0x40, 0x50, - 0x60, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Complete */ - static const unsigned char ra_upd_complete[] = { - 0x08, 0x0a - }; - - /* DTAP - Detach Request (MO) */ - /* normal detach, power_off = 1 */ - static const unsigned char detach_req[] = { - 0x08, 0x05, 0x09, 0x18, 0x05, 0xf4, 0xef, 0xe2, - 0xb7, 0x00, 0x19, 0x03, 0xb9, 0x97, 0xcb - }; - - sgsn->cfg.auth_policy = SGSN_AUTH_POLICY_OPEN; - - printf("Testing P-TMSI allocation\n"); - - printf(" - sgsn_alloc_ptmsi\n"); - - /* reset the PRNG used by sgsn_alloc_ptmsi */ - srand(1); - - ptmsi1 = sgsn_alloc_ptmsi(); - OSMO_ASSERT(ptmsi1 != GSM_RESERVED_TMSI); - - ptmsi2 = sgsn_alloc_ptmsi(); - OSMO_ASSERT(ptmsi2 != GSM_RESERVED_TMSI); - - OSMO_ASSERT(ptmsi1 != ptmsi2); - - ptmsi1 = ptmsi2 = GSM_RESERVED_TMSI; - - printf(" - Repeated Attach Request\n"); - - foreign_tlli = gprs_tmsi2tlli(0xc0000023, TLLI_FOREIGN); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - lle = gprs_lle_get_or_create(foreign_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - - ctx = sgsn_mm_ctx_by_tlli(foreign_tlli, &raid); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - ptmsi1 = ctx->p_tmsi; - - old_ptmsi = ctx->p_tmsi_old; - - /* we expect an identity request (IMEI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - /* inject the identity response (IMEI) */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - ident_resp_imei, ARRAY_SIZE(ident_resp_imei)); - - /* check that the MM context has not been removed due to a failed - * authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid)); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ptmsi1); - - /* we ignore this and send the attach again */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - - /* the allocated P-TMSI should be the same */ - ctx = sgsn_mm_ctx_by_tlli(foreign_tlli, &raid); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == old_ptmsi); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ptmsi1); - - /* inject the attach complete */ - local_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, local_tlli, &raid, - attach_compl, ARRAY_SIZE(attach_compl)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - printf(" - Repeated RA Update Request\n"); - - /* inject the RA update request */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - ra_upd_req, ARRAY_SIZE(ra_upd_req)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - OSMO_ASSERT(ctx->p_tmsi != ptmsi1); - ptmsi2 = ctx->p_tmsi; - - /* repeat the RA update request */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - ra_upd_req, ARRAY_SIZE(ra_upd_req)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ptmsi2); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi == ptmsi2); - - /* inject the RA update complete */ - local_tlli = gprs_tmsi2tlli(ptmsi2, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, local_tlli, &raid, - ra_upd_complete, ARRAY_SIZE(ra_upd_complete)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi2); - - /* inject the detach */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - detach_req, ARRAY_SIZE(detach_req)); - - /* verify that things are gone */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - ictx = sgsn_mm_ctx_by_tlli(local_tlli, &raid); - OSMO_ASSERT(!ictx); - - sgsn->cfg.auth_policy = saved_auth_policy; - - cleanup_test(); -} - -/* - * Test changing of routing areas - */ -static void test_gmm_routing_areas(void) -{ - struct gprs_ra_id raid1 = { .mnc=332, .mcc=112, .lac=16464, .rac=96}; - struct gprs_ra_id raid2 = { .mnc=332, .mcc=112, .lac=16464, .rac=97}; - struct sgsn_mm_ctx *ctx = NULL; - struct sgsn_mm_ctx *ictx; - uint32_t ptmsi1; - uint32_t received_ptmsi; - uint32_t ms_tlli = 0; - struct gprs_llc_lle *lle; - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - - /* DTAP - Attach Request (IMSI 12131415161718) */ - static const unsigned char attach_req[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, - 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, 0x19, - 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, - 0x60, 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, - 0x80, 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, - 0x00, - }; - - /* DTAP - Attach Request (IMSI 12131415161718) (RA 2) */ - static const unsigned char attach_req2[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, - 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x11, 0x22, 0x33, 0x40, 0x50, 0x61, 0x19, - 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, - 0x60, 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, - 0x80, 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, - 0x00, - }; - - /* DTAP - Identity Response IMEI */ - static const unsigned char ident_resp_imei[] = { - 0x08, 0x16, 0x08, 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, - 0x56 - }; - - /* DTAP - Attach Complete */ - static const unsigned char attach_compl[] = { - 0x08, 0x03 - }; - - /* DTAP - Routing Area Update Request (coming from RA 1) */ - static const unsigned char ra_upd_req1[] = { - 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, 0x40, 0x50, - 0x60, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Request (coming from RA 2) */ - static const unsigned char ra_upd_req2[] = { - 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, 0x40, 0x50, - 0x61, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Request (coming from RA other) */ - /* raid_other = {443, 223, 16464, 98}; */ - static const unsigned char ra_upd_req_other[] = { - 0x08, 0x08, 0x10, 0x22, 0x33, 0x44, 0x40, 0x50, - 0x62, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Complete */ - static const unsigned char ra_upd_complete[] = { - 0x08, 0x0a - }; - - /* DTAP - Detach Request (MO) */ - /* normal detach, power_off = 1 */ - static const unsigned char detach_req[] = { - 0x08, 0x05, 0x09, 0x18, 0x05, 0xf4, 0xef, 0xe2, - 0xb7, 0x00, 0x19, 0x03, 0xb9, 0x97, 0xcb - }; - - sgsn->cfg.auth_policy = SGSN_AUTH_POLICY_OPEN; - - printf("Testing routing area changes\n"); - - /* reset the PRNG used by sgsn_alloc_ptmsi */ - srand(1); - - ptmsi1 = GSM_RESERVED_TMSI; - - printf(" - Attach Request (RA 1)\n"); - - ms_tlli = gprs_tmsi2tlli(0x00000023, TLLI_RANDOM); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - lle = gprs_lle_get_or_create(ms_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, ms_tlli, &raid1, - attach_req, ARRAY_SIZE(attach_req)); - - ctx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid1); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - - /* we expect an identity request (IMEI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_ID_REQ); - OSMO_ASSERT(last_dl_parse_ctx.tlli == ms_tlli); - - /* inject the identity response (IMEI) */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - ident_resp_imei, ARRAY_SIZE(ident_resp_imei)); - - /* check that the MM context has not been removed due to a failed - * authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(ms_tlli, &raid1)); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_ATTACH_ACK); - OSMO_ASSERT(last_dl_parse_ctx.tlli == ms_tlli); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the attach complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - attach_compl, ARRAY_SIZE(attach_compl)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - printf(" - RA Update Request (RA 1 -> RA 1)\n"); - - /* inject the RA update request */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - ra_upd_req1, ARRAY_SIZE(ra_upd_req1)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_ACK); - // OSMO_ASSERT(last_dl_parse_ctx.tlli == ms_tlli); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - OSMO_ASSERT(ctx->p_tmsi != ptmsi1); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the RA update complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - ra_upd_complete, ARRAY_SIZE(ra_upd_complete)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - OSMO_ASSERT(ctx->gb.tlli == ms_tlli); - - printf(" - RA Update Request (RA 1 -> RA 2)\n"); - - /* inject the RA update request */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_FOREIGN); - - /* It is coming from RA 1 => ra_upd_req1 */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_req1, ARRAY_SIZE(ra_upd_req1)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_ACK); - - printf(" - RA Update Request (RA other -> RA 2)\n"); - - /* inject the RA update request */ - ms_tlli = gprs_tmsi2tlli(0x12345678, TLLI_FOREIGN); - - /* It is coming from RA 1 => ra_upd_req1 */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_req_other, ARRAY_SIZE(ra_upd_req_other)); - - /* we expect an RA update reject (and a LLC XID RESET) */ - OSMO_ASSERT(sgsn_tx_counter == 2); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_REJ); - /* this has killed the LLE/LLME */ - - printf(" - Attach Request (RA 2)\n"); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 1); - lle = gprs_lle_get_or_create(ms_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, ms_tlli, &raid2, - attach_req2, ARRAY_SIZE(attach_req2)); - - ctx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid2); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_ATTACH_ACK); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the attach complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - ictx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid2); - OSMO_ASSERT(ictx != NULL); - OSMO_ASSERT(ictx == ctx); - - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - attach_compl, ARRAY_SIZE(attach_compl)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - printf(" - RA Update Request (RA 2 -> RA 2)\n"); - - /* inject the RA update request */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_req2, ARRAY_SIZE(ra_upd_req2)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_ACK); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - OSMO_ASSERT(ctx->p_tmsi != ptmsi1); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the RA update complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_complete, ARRAY_SIZE(ra_upd_complete)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - OSMO_ASSERT(ctx->gb.tlli == ms_tlli); - - - /* inject the detach */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - detach_req, ARRAY_SIZE(detach_req)); - - /* verify that things are gone */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - ictx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid2); - OSMO_ASSERT(!ictx); - - sgsn->cfg.auth_policy = saved_auth_policy; - - cleanup_test(); -} - static void test_apn_matching(void) { struct apn_ctx *actx, *actxs[9]; @@ -2462,17 +1653,8 @@ test_gmm_detach_no_mmctx(); test_gmm_detach_accept_unexpected(); test_gmm_status_no_mmctx(); - test_gmm_attach_acl(); - test_gmm_attach_subscr(); - test_gmm_attach_subscr_fake_auth(); - test_gmm_attach_subscr_real_auth(); - test_gmm_attach_subscr_gsup_auth(0); - test_gmm_attach_subscr_gsup_auth(1); - test_gmm_attach_subscr_real_gsup_auth(0); test_gmm_reject(); test_gmm_cancel(); - test_gmm_ptmsi_allocation(); - test_gmm_routing_areas(); test_apn_matching(); test_ggsn_selection(); printf("Done\n"); diff --git a/tests/sgsn/sgsn_test.ok b/tests/sgsn/sgsn_test.ok index f38d730..e7e7cf6 100644 --- a/tests/sgsn/sgsn_test.ok +++ b/tests/sgsn/sgsn_test.ok @@ -15,13 +15,6 @@ Testing GMM detach (no MMCTX) Testing GMM detach accept (unexpected) Testing GMM Status (no MMCTX) -Auth policy 'closed': Testing GMM attach -Auth policy 'remote': Testing GMM attach -Auth policy 'remote', auth faked: Testing GMM attach -Auth policy 'remote', triplet based auth: Testing GMM attach -Auth policy 'remote', GSUP based auth: Testing GMM attach -Auth policy 'remote', GSUP based auth: Testing GMM attach with retry -Auth policy 'remote', real GSUP based auth: Testing GMM attach Testing GMM reject - Attach Request (invalid MI length) - Attach Request (invalid MI type) @@ -29,17 +22,6 @@ - Routing Area Update Request (invalid type) - Routing Area Update Request (invalid CAP length) Testing cancellation -Testing P-TMSI allocation - - sgsn_alloc_ptmsi - - Repeated Attach Request - - Repeated RA Update Request -Testing routing area changes - - Attach Request (RA 1) - - RA Update Request (RA 1 -> RA 1) - - RA Update Request (RA 1 -> RA 2) - - RA Update Request (RA other -> RA 2) - - Attach Request (RA 2) - - RA Update Request (RA 2 -> RA 2) Testing APN matching Testing GGSN selection Done -- 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: merged Gerrit-Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 Gerrit-Change-Number: 9258 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:51:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:51:38 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9257 ) 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, 494 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 269cebc..3b563c4 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -5,6 +5,7 @@ gb_proxy.h \ gprs_gb_parse.h \ gprs_gmm.h \ + gprs_gmm_attach.h \ gprs_llc.h \ gprs_llc_xid.h \ gprs_sgsn.h \ diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index d12eaf9..ffcebd3 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -40,6 +40,8 @@ uint8_t gmm_cause); int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm); +int gprs_gmm_attach_req_ies(struct msgb *a, struct msgb *b); + /* TODO: move extract_subscr_* when gsm48_gmm_authorize() got removed */ void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx); void extract_subscr_hlr(struct sgsn_mm_ctx *ctx); diff --git a/include/osmocom/sgsn/gprs_gmm_attach.h b/include/osmocom/sgsn/gprs_gmm_attach.h new file mode 100644 index 0000000..22fbd6f --- /dev/null +++ b/include/osmocom/sgsn/gprs_gmm_attach.h @@ -0,0 +1,37 @@ +#ifndef GPRS_GMM_ATTACH_H +#define GPRS_GMM_ATTACH_H + +#include + +struct sgsn_mm_ctx; + +enum gmm_attach_req_fsm_states { + ST_INIT, + ST_IDENTIY, + ST_RETRIEVE_AUTH, + ST_AUTH, + ST_ASK_VLR, + ST_ACCEPT, + ST_REJECT +}; + +enum gmm_attach_req_fsm_events { + E_ATTACH_REQ_RECV, + E_IDEN_RESP_RECV, + E_AUTH_RESP_RECV_SUCCESS, + E_AUTH_RESP_RECV_RESYNC, + E_ATTACH_ACCEPTED, + E_ATTACH_ACCEPT_SENT, + E_ATTACH_COMPLETE_RECV, + E_REJECT, + E_VLR_ANSWERED, +}; + +#define GMM_DISCARD_MS_WITHOUT_REJECT -1 + +extern const struct value_string gmm_attach_req_fsm_event_names[]; +extern struct osmo_fsm gmm_attach_req_fsm; + +void gmm_att_req_free(struct sgsn_mm_ctx *mm); + +#endif // GPRS_GMM_ATTACH_H diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 6f16dc7..a5ca959 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -168,6 +169,15 @@ struct ranap_ue_conn_ctx *ue_ctx; struct service_info service; } iu; + struct { + struct osmo_fsm_inst *fsm; + + /* when a second attach req arrives while in this procedure, + * the fsm needs to compare it against old to decide what to do */ + struct msgb *attach_req; + uint32_t id_type; + bool auth_reattempt; + } gmm_att_req; /* VLR number */ uint32_t new_sgsn_addr; /* Authentication Triplet */ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 46d94d4..0f7c5fa 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -59,6 +59,7 @@ $(NULL) osmo_sgsn_SOURCES = \ + gprs_gmm_attach.c \ gprs_gmm.c \ gprs_sgsn.c \ gprs_sndcp.c \ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index bea63dc..a363c70 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -791,7 +792,7 @@ /* FIXME: enable LLC cipheirng */ /* Check if we can let the mobile station enter */ - return gsm48_gmm_authorize(ctx); + return osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_AUTH_RESP_RECV_SUCCESS, NULL); } /* Section 9.4.10: Authentication and Ciphering Failure */ @@ -836,7 +837,7 @@ rc = gprs_subscr_request_auth_info(ctx, auts, ctx->auth_triplet.vec.rand); if (!rc) - return 0; + return osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_AUTH_RESP_RECV_RESYNC, NULL); /* on error, fall through to send a reject */ LOGMMCTXP(LOGL_ERROR, ctx, "Sending AUTS to HLR failed (rc = %d)\n", rc); @@ -1107,7 +1108,10 @@ { ctx->sec_ctx = OSMO_AUTH_TYPE_NONE; - gsm48_gmm_authorize(ctx); + if (ctx->gmm_att_req.fsm->state != ST_INIT) + osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_VLR_ANSWERED, (void *) 0); + else + gsm48_gmm_authorize(ctx); } void gsm0408_gprs_access_granted(struct sgsn_mm_ctx *ctx) @@ -1118,7 +1122,8 @@ "Authorized, continuing procedure, IMSI=%s\n", ctx->imsi); /* Continue with the authorization */ - gsm48_gmm_authorize(ctx); + if (ctx->gmm_att_req.fsm->state != ST_INIT) + osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_VLR_ANSWERED, (void *) 0); break; default: LOGMMCTXP(LOGL_INFO, ctx, @@ -1139,8 +1144,8 @@ "with cause '%s' (%d)\n", get_value_string(gsm48_gmm_cause_names, gmm_cause), gmm_cause); - gsm48_tx_gmm_att_rej(ctx, gmm_cause); - mm_ctx_cleanup_free(ctx, "GPRS ATTACH REJECT"); + if (ctx->gmm_att_req.fsm->state != ST_INIT) + osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_REJECT, (void *) (long) gmm_cause); break; case GMM_REGISTERED_NORMAL: case GMM_REGISTERED_SUSPENDED: @@ -1183,6 +1188,7 @@ { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; + long mi_typel = mi_type; char mi_string[GSM48_MI_SIZE]; gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); @@ -1235,7 +1241,7 @@ } /* Check if we can let the mobile station enter */ - return gsm48_gmm_authorize(ctx); + return osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_IDEN_RESP_RECV, (void *)mi_typel); } /* Allocate a new P-TMSI and change context state */ @@ -1425,8 +1431,8 @@ gprs_llgmm_assign(ctx->gb.llme, ctx->gb.tlli, ctx->gb.tlli_new); } - ctx->pending_req = GSM48_MT_GMM_ATTACH_REQ; - return gsm48_gmm_authorize(ctx); + osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_ATTACH_REQ_RECV, msg); + return 0; err_inval: LOGPC(DMM, LOGL_INFO, "\n"); @@ -1447,6 +1453,28 @@ } + +/* Checks if two attach request contain the IEs and IE values + * return 0 if equal + * return -1 if error + * return 1 if unequal + * + * Only do a simple memcmp for now. + */ +int gprs_gmm_attach_req_ies(struct msgb *a, struct msgb *b) +{ + struct gsm48_hdr *gh_a = (struct gsm48_hdr *) msgb_gmmh(a); + struct gsm48_hdr *gh_b = (struct gsm48_hdr *) msgb_gmmh(b); + +#define GMM_ATTACH_REQ_LEN 26 + + /* there is the LLC FCS behind */ + if (msgb_l3len(a) < GMM_ATTACH_REQ_LEN || msgb_l3len(b) < GMM_ATTACH_REQ_LEN) + return -1; + + return !!memcmp(gh_a, gh_b, GMM_ATTACH_REQ_LEN); +} + /* Section 4.7.4.1 / 9.4.5.2 MO Detach request */ static int gsm48_rx_gmm_det_req(struct sgsn_mm_ctx *ctx, struct msgb *msg) { @@ -2023,6 +2051,7 @@ mmctx_set_mm_state(mmctx, MM_READY); rc = 0; + osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 0); memset(&sig_data, 0, sizeof(sig_data)); sig_data.mm = mmctx; osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data); diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c new file mode 100644 index 0000000..272fec7 --- /dev/null +++ b/src/gprs/gprs_gmm_attach.c @@ -0,0 +1,398 @@ +#include + +#include +#include +#include +#include + +#define X(s) (1 << (s)) + +static int require_identity_imei = 1; +static int require_auth = 1; + +static void st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + struct msgb *attach_req = data; + + /* we can run st_init multiple times */ + if (ctx->gmm_att_req.attach_req) + msgb_free(ctx->gmm_att_req.attach_req); + + ctx->gmm_att_req.attach_req = msgb_copy(attach_req, "Attach Request"); + ctx->auth_state = SGSN_AUTH_UNKNOWN; + ctx->gmm_att_req.auth_reattempt = 0; + + /* + * TODO: remove pending_req as soon the sgsn_auth code doesn't depend + * on it. + * pending_req must be set, even this fsm doesn't use it, because + * the sgsn_auth code is using this too + */ + ctx->pending_req = GSM48_MT_GMM_ATTACH_REQ; + + if (require_identity_imei) { + ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMEI; + osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + } else if (!strlen(ctx->imsi)) { + ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMSI; + osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + } else if (require_auth) + osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + else + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); +} + +static void st_identity_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + int ret = 0; + + ctx->num_T_exp = 0; + + switch (ctx->gmm_att_req.id_type) { + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMSI: + break; + default: + /* TODO logging */ + osmo_fsm_inst_dispatch(fi, E_REJECT, NULL); + return; + } + + ctx->t3370_id_type = ctx->gmm_att_req.id_type; + ret = gsm48_tx_gmm_id_req(ctx, ctx->gmm_att_req.id_type); + if (ret < 0) { + LOGPFSM(fi, "Can not send tx_gmm_id %d.\n", ret); + osmo_fsm_inst_dispatch(fi, E_REJECT, NULL); + } +} + +static void st_identity(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + OSMO_ASSERT(event == E_IDEN_RESP_RECV); + + /* check if we received a identity response */ + long type = (long) data; + switch (type) { + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMSI: + break; + default: + LOGMMCTXP(LOGL_ERROR, ctx, "Unknown mi type: 0x%lx, rejecting MS.\n", type); + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_NET_FAIL); + return; + } + + if (type != ctx->gmm_att_req.id_type) { + /* ignore wrong package */ + /* TODO logging */ + return; + } + + if (type == GSM_MI_TYPE_IMEI && !strlen(ctx->imsi)) { + ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMSI; + osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + } else if (require_auth) + osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + else + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); +} + +static void st_auth_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + enum sgsn_auth_state auth_state; + + ctx->num_T_exp = 0; + + /* TODO: remove this layer violation. Don't parse any auth_policy here + * The correct way would be to ask the SGSN is this mmctx has to be auth + * regardless of the state. + * Otherwise someone else could steal the TLLI and just use it without further + * auth. + */ + if (sgsn->cfg.auth_policy != SGSN_AUTH_POLICY_REMOTE) { + /* we can "trust" sgsn_auth_state as long it's not remote */ + auth_state = sgsn_auth_state(ctx); + } else { + auth_state = ctx->auth_state; + } + + switch(auth_state) { + case SGSN_AUTH_UMTS_RESYNC: /* ask the vlr for a new vector to match the simcards seq */ + case SGSN_AUTH_UNKNOWN: /* the SGSN doesn know this MS */ + osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + break; + case SGSN_AUTH_REJECTED: + /* TODO: correct GMM cause */ + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_GPRS_NOTALLOWED); + break; + case SGSN_AUTH_ACCEPTED: + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + break; + case SGSN_AUTH_AUTHENTICATE: + if (ctx->auth_triplet.key_seq == GSM_KEY_SEQ_INVAL) { + /* invalid key material */ + osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + } + + struct gsm_auth_tuple *at = &ctx->auth_triplet; + if (gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, + false) < 0) { + /* network failure */ + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_NET_FAIL); + } + ctx->gmm_att_req.auth_reattempt++; + break; + } +} + +static void st_auth(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + switch (event) { + case E_AUTH_RESP_RECV_SUCCESS: + sgsn_auth_request(ctx); + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + break; + case E_AUTH_RESP_RECV_RESYNC: + if (ctx->gmm_att_req.auth_reattempt <= 1) + osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + else + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_SYNC_FAIL); + break; + } +} + +static void st_accept_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + ctx->num_T_exp = 0; + + /* TODO: remove pending_req as soon the sgsn_auth code doesn't depend on it */ + ctx->pending_req = 0; + gsm48_tx_gmm_att_ack(ctx); +} + +static void st_accept(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + switch(event) { + case E_ATTACH_COMPLETE_RECV: + /* TODO: #ifdef ! PTMSI_ALLOC is not supported */ + extract_subscr_msisdn(ctx); + extract_subscr_hlr(ctx); + osmo_fsm_inst_state_chg(fi, ST_INIT, 0, 0); + break; + } +} + +static void st_reject(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + long reject_cause = (long) data; + + if (reject_cause != GMM_DISCARD_MS_WITHOUT_REJECT) + gsm48_tx_gmm_att_rej(ctx, (uint8_t) reject_cause); + + sgsn_mm_ctx_cleanup_free(ctx); +} + +static void st_ask_vlr_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + /* FIXME: remove this layer violation. + * The VLR should send the message to the HLR and not the rx function + * gsm48_rx_gmm_auth_ciph_fail. Because gmm_auth_ciph_fail already send a + * message to the HLR, we don't send here a request. */ + if (ctx->auth_state == SGSN_AUTH_UMTS_RESYNC) + return; + + /* ask the auth layer for more data */ + sgsn_auth_request(ctx); +} + +static void st_ask_vlr(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_VLR_ANSWERED: + osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + break; + } +} + +static struct osmo_fsm_state gmm_attach_req_fsm_states[] = { + /* default state for non-DTX and DTX when SPEECH is in progress */ + [ST_INIT] = { + .in_event_mask = X(E_ATTACH_REQ_RECV), + .out_state_mask = X(ST_INIT) | X(ST_IDENTIY) | X(ST_AUTH) | X(ST_ACCEPT), + .name = "Init", + .action = st_init, + }, + [ST_ASK_VLR] = { + .in_event_mask = X(E_VLR_ANSWERED), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_REJECT), + .name = "AskVLR", + .onenter = st_ask_vlr_on_enter, + .action = st_ask_vlr, + }, + [ST_IDENTIY] = { + .in_event_mask = X(E_IDEN_RESP_RECV), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_IDENTIY) | X(ST_REJECT), + .onenter = st_identity_on_enter, + .name = "CheckIdentity", + .action = st_identity, + }, + [ST_AUTH] = { + .in_event_mask = X(E_AUTH_RESP_RECV_SUCCESS) | X(E_AUTH_RESP_RECV_RESYNC), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT), + .name = "Authenticate", + .onenter = st_auth_on_enter, + .action = st_auth, + }, + [ST_ACCEPT] = { + .in_event_mask = X(E_ATTACH_COMPLETE_RECV), + .out_state_mask = X(ST_INIT) | X(ST_REJECT), + .name = "WaitAttachComplete", + .onenter = st_accept_on_enter, + .action = st_accept, + }, + [ST_REJECT] = { + .in_event_mask = X(E_REJECT), + .out_state_mask = X(ST_INIT), + .name = "Reject", + .action = st_reject, + }, +}; + +const struct value_string gmm_attach_req_fsm_event_names[] = { + { E_ATTACH_REQ_RECV, "Received an attach request" }, + { E_IDEN_RESP_RECV, "Identity Request received" }, + { E_AUTH_RESP_RECV_SUCCESS, "Authentication Response received" }, + { E_AUTH_RESP_RECV_RESYNC, "Authentication Failure with resync received" }, + { E_ATTACH_ACCEPTED, "Attach accepted" }, + { E_ATTACH_ACCEPT_SENT, "Attach accept sent" }, + { E_ATTACH_COMPLETE_RECV, "Attach complete received." }, + { E_REJECT, "Reject the MS"}, + { E_VLR_ANSWERED, "VLR answered"}, + { 0, NULL } +}; + +void gmm_attach_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct sgsn_mm_ctx *ctx = fi->priv; + struct msgb *new_attach_req = data; + + switch (event) { + case E_ATTACH_REQ_RECV: + switch (fi->state) { + case ST_INIT: + case ST_REJECT: + st_init(fi, event, data); + break; + + case ST_ACCEPT: + /* TODO: drop all state (e.g. PDP Ctx) and do this procedure */ + osmo_fsm_inst_state_chg(fi, ST_INIT, 0, 0); + st_init(fi, event, data); + break; + + case ST_ASK_VLR: + case ST_AUTH: + case ST_IDENTIY: + case ST_RETRIEVE_AUTH: + /* 04.08 4.7.3.1.6 d) Abnormal Case + * Only do action if Req IEs differs. */ + if (ctx->gmm_att_req.attach_req && + gprs_gmm_attach_req_ies(new_attach_req, ctx->gmm_att_req.attach_req)) { + osmo_fsm_inst_state_chg(fi, ST_INIT, 0, 0); + st_init(fi, event, data); + } + break; + } + break; + case E_REJECT: + if (fi->state != ST_REJECT) + osmo_fsm_inst_state_chg(fi, ST_REJECT, 0, 0); + st_reject(fi, event, data); + break; + } +} + +int gmm_attach_timer_cb(struct osmo_fsm_inst *fi) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + struct gsm_auth_tuple *at = &ctx->auth_triplet; + + ctx->num_T_exp++; + + switch(fi->state) { + case ST_ASK_VLR: + /* TODO: replace T3350 by a better timer or it's own + * re-use T3350 - not defined by standard */ + LOGMMCTXP(LOGL_ERROR, ctx, "HLR did not answer in time. Rejecting.\n"); + osmo_fsm_inst_dispatch(fi, E_REJECT, + (void *) GMM_CAUSE_NET_FAIL); + break; + case ST_IDENTIY: + /* T3370 */ + if (ctx->num_T_exp >= 5) { + osmo_fsm_inst_dispatch(fi, E_REJECT, + (void *) GMM_CAUSE_MS_ID_NOT_DERIVED); + break; + } + gsm48_tx_gmm_id_req(ctx, ctx->gmm_att_req.id_type); + osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3370, 0); + break; + case ST_AUTH: + /* T3360 */ + if (ctx->num_T_exp >= 5) { + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_DISCARD_MS_WITHOUT_REJECT); + break; + } + gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, false); + osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3360, 0); + break; + case ST_ACCEPT: + /* T3350 */ + if (ctx->num_T_exp >= 5) { + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_DISCARD_MS_WITHOUT_REJECT); + break; + } + gsm48_tx_gmm_att_ack(ctx); + osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3350, 0); + break; + } + + return 0; +} + +struct osmo_fsm gmm_attach_req_fsm = { + .name = "GMM_ATTACH_REQ_FSM", + .states = gmm_attach_req_fsm_states, + .num_states = ARRAY_SIZE(gmm_attach_req_fsm_states), + .event_names = gmm_attach_req_fsm_event_names, + .allstate_event_mask = X(E_REJECT) | X(E_ATTACH_REQ_RECV), + .allstate_action = gmm_attach_allstate_action, + .log_subsys = DMM, + .timer_cb = gmm_attach_timer_cb, +}; + +static __attribute__((constructor)) void gprs_gmm_fsm_init(void) +{ + osmo_fsm_register(&gmm_attach_req_fsm); +} + +void gmm_att_req_free(struct sgsn_mm_ctx *mm) { + if (mm->gmm_att_req.fsm) + osmo_fsm_inst_free(mm->gmm_att_req.fsm); + + if (mm->gmm_att_req.attach_req) + msgb_free(mm->gmm_att_req.attach_req); +} diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index d8bca85..977ae48 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -241,6 +242,7 @@ talloc_free(ctx); return NULL; } + ctx->gmm_att_req.fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "gb_gmm_req"); INIT_LLIST_HEAD(&ctx->pdp_list); llist_add(&ctx->list, &sgsn_mm_ctxts); @@ -273,6 +275,7 @@ talloc_free(ctx); return NULL; } + ctx->gmm_att_req.fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "gb_gmm_req"); /* Need to get RAID from IU conn */ ctx->ra = ctx->iu.ue_ctx->ra_id; @@ -350,6 +353,9 @@ gprs_subscr_put(subscr); } + if (mm->gmm_att_req.fsm) + gmm_att_req_free(mm); + sgsn_mm_ctx_free(mm); mm = NULL; diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index abcc357..0eb2100 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -45,6 +45,7 @@ $(top_builddir)/src/gprs/gprs_llc.o \ $(top_builddir)/src/gprs/crc24.o \ $(top_builddir)/src/gprs/gprs_sndcp.o \ + $(top_builddir)/src/gprs/gprs_gmm_attach.o \ $(top_builddir)/src/gprs/gprs_gmm.o \ $(top_builddir)/src/gprs/gprs_sgsn.o \ $(top_builddir)/src/gprs/sgsn_vty.o \ -- 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: merged Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 17 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 Thu Sep 13 13:52:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:52:12 +0000 Subject: Change in osmo-bts[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10921 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10921 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: I75fdd06cc52ce50628efb1f9b007d2e3926db27d Gerrit-Change-Number: 10921 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13: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 Thu Sep 13 13:52:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:52:17 +0000 Subject: Change in osmo-bts[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10898 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10898 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: I87299134696bbfc6721b1226d4de6c73854aa846 Gerrit-Change-Number: 10898 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:52:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:53:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:53:04 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:53: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 Sep 13 13:53:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:53:21 +0000 Subject: Change in libosmocore[master]: gsm0808: implement BSSMAP Classmark Request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10911 ) Change subject: gsm0808: implement BSSMAP Classmark Request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10911 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: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 Gerrit-Change-Number: 10911 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:53: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 Sep 13 13:53:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:53:47 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry ...................................................................... Patch Set 1: Code-Review+1 cvan we please right away introduce a BSC_Tests.ttcn testing for this newly-supported message? -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:53:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:55:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:55:15 +0000 Subject: Change in osmo-bsc[master]: LCLS: use type and tch_mode from lchan to check codec In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10905 ) Change subject: LCLS: use type and tch_mode from lchan to check codec ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10905/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10905/1//COMMIT_MSG at 13 PS1, Line 13: abandonned struct members why are we abandoning struct members without a) auditing all code that still uses them b) removing any members that are abandoned? https://gerrit.osmocom.org/#/c/10905/1//COMMIT_MSG at 16 PS1, Line 16: memfffubers memfffubers? -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:55:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:55:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:55:25 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 13:55:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:55:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:55:33 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 13:55: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 Sep 13 13:56:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:56:15 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10906/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10906/1//COMMIT_MSG at 10 PS1, Line 10: used anymore. Lets remove it. it would be good to reference the change-id which made it unused/abandoned. -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 13:56:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:56:35 +0000 Subject: Change in gr-gsm[master]: Add .gitreview similar to the other osmocom's projects In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10882 ) Change subject: Add .gitreview similar to the other osmocom's projects ...................................................................... Add .gitreview similar to the other osmocom's projects A gitreview file is required to use git review. More information about git review https://docs.openstack.org/infra/git-review/ https://www.mediawiki.org/wiki/Gerrit/git-review Change-Id: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4 --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..85e5df7 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=gr-gsm -- To view, visit https://gerrit.osmocom.org/10882 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: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4 Gerrit-Change-Number: 10882 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:56:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:56:42 +0000 Subject: Change in libosmo-sccp[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10912 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10912 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: I437e6ada9f391eece75b2f2e2af3bec4e8e9f6ce Gerrit-Change-Number: 10912 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:56: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 Sep 13 13:56:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:56:43 +0000 Subject: Change in libosmo-sccp[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10912 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I437e6ada9f391eece75b2f2e2af3bec4e8e9f6ce --- M debian/osmo-stp.install M doc/examples/Makefile.am 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install index 839735c..b3234e2 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-stp.cfg /lib/systemd/system/osmo-stp.service /usr/bin/osmo-stp /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index b1a7a0f..a8e9991 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,4 +1,7 @@ examples_stpdir = $(docdir)/examples/osmo-stp examples_stp_DATA = osmo-stp.cfg -EXTRA_DIST = $(examples_stp_DATA) +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-stp.cfg + +EXTRA_DIST = osmo-stp.cfg -- To view, visit https://gerrit.osmocom.org/10912 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: I437e6ada9f391eece75b2f2e2af3bec4e8e9f6ce Gerrit-Change-Number: 10912 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 Sep 13 13:56:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:56:45 +0000 Subject: Change in osmo-bts[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10898 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10898 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: I87299134696bbfc6721b1226d4de6c73854aa846 Gerrit-Change-Number: 10898 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:56:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:56:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:56:47 +0000 Subject: Change in osmo-bts[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10898 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I87299134696bbfc6721b1226d4de6c73854aa846 --- M Makefile.am M configure.ac A contrib/Makefile.am D contrib/sysmobts.service A contrib/systemd/Makefile.am R contrib/systemd/lc15bts-mgr.service R contrib/systemd/osmo-bts-lc15.service R contrib/systemd/osmo-bts-sysmo.service R contrib/systemd/sysmobts-mgr.service M debian/osmo-bts-trx.install D debian/osmo-bts-trx.service M debian/osmo-bts-virtual.install D debian/osmo-bts-virtual.service M debian/rules 14 files changed, 45 insertions(+), 25 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 10ff2d2..b573aa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,11 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src tests doc +SUBDIRS = include src tests doc contrib # package the contrib and doc EXTRA_DIST = \ - contrib/dump_docs.py contrib/screenrc-l1fwd contrib/osmo-bts-sysmo.service \ + contrib/dump_docs.py contrib/screenrc-l1fwd \ contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \ doc/examples/sysmo/osmo-bts.cfg \ doc/examples/sysmo/sysmobts-mgr.cfg \ @@ -14,6 +14,9 @@ git-version-gen .version \ README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index aad55db..38e6713 100644 --- a/configure.ac +++ b/configure.ac @@ -279,6 +279,22 @@ CPPFLAGS=$oldCPPFLAGS fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -307,4 +323,6 @@ tests/meas/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/sysmobts.service b/contrib/sysmobts.service deleted file mode 100644 index 64e0127..0000000 --- a/contrib/sysmobts.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=sysmocom sysmoBTS - -[Service] -Type=simple -ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' -ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M -ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' -ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s' -Restart=always -RestartSec=2 -RestartPreventExitStatus=1 - -# The msg queues must be read fast enough -CPUSchedulingPolicy=rr -CPUSchedulingPriority=1 - -[Install] -WantedBy=multi-user.target -Alias=osmo-bts-sysmo.service diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..1646308 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,18 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = osmo-bts-virtual.service + +if ENABLE_SYSMOBTS +SYSTEMD_SERVICES += osmo-bts-sysmo.service sysmobts-mgr.service +endif + +if ENABLE_TRX +SYSTEMD_SERVICES += osmo-bts-trx.service +endif + +if ENABLE_LC15BTS +SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service +endif + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif # HAVE_SYSTEMD diff --git a/contrib/lc15bts-mgr.service b/contrib/systemd/lc15bts-mgr.service similarity index 100% rename from contrib/lc15bts-mgr.service rename to contrib/systemd/lc15bts-mgr.service diff --git a/contrib/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service similarity index 100% rename from contrib/osmo-bts-lc15.service rename to contrib/systemd/osmo-bts-lc15.service diff --git a/contrib/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service similarity index 100% rename from contrib/osmo-bts-sysmo.service rename to contrib/systemd/osmo-bts-sysmo.service diff --git a/contrib/sysmobts-mgr.service b/contrib/systemd/sysmobts-mgr.service similarity index 100% rename from contrib/sysmobts-mgr.service rename to contrib/systemd/sysmobts-mgr.service diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install index e821cb4..2343d25 100644 --- a/debian/osmo-bts-trx.install +++ b/debian/osmo-bts-trx.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bts-trx.service usr/bin/osmo-bts-trx usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg diff --git a/debian/osmo-bts-trx.service b/debian/osmo-bts-trx.service deleted file mode 120000 index 1abb0ce..0000000 --- a/debian/osmo-bts-trx.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bts-trx.service \ No newline at end of file diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install index 3815d7c..0e6ca1b 100644 --- a/debian/osmo-bts-virtual.install +++ b/debian/osmo-bts-virtual.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bts-virtual.service usr/bin/osmo-bts-virtual usr/bin/osmo-bts-omldummy usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg diff --git a/debian/osmo-bts-virtual.service b/debian/osmo-bts-virtual.service deleted file mode 120000 index 9a660b4..0000000 --- a/debian/osmo-bts-virtual.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bts-virtual.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index dcc8a11..27de11b 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg override_dh_auto_configure: - dh_auto_configure -- --enable-trx + dh_auto_configure -- --enable-trx --with-systemdsystemunitdir=/lib/systemd/system override_dh_clean: dh_clean -- To view, visit https://gerrit.osmocom.org/10898 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: I87299134696bbfc6721b1226d4de6c73854aa846 Gerrit-Change-Number: 10898 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 Thu Sep 13 13:56:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:56:48 +0000 Subject: Change in osmo-hlr[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10915 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10915 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: I2ac73f426d9489fcd64c2eea547eb1f3ec26ae2c Gerrit-Change-Number: 10915 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13: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 Thu Sep 13 13:56:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:56:54 +0000 Subject: Change in osmo-trx[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10900 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10900 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: Ia1a4fb62dee35737ece1f3501f352501eba2449e Gerrit-Change-Number: 10900 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13: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 Thu Sep 13 13:56:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:56:55 +0000 Subject: Change in osmo-trx[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10900 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ia1a4fb62dee35737ece1f3501f352501eba2449e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-trx-lms.install D debian/osmo-trx-lms.service M debian/osmo-trx-uhd.install D debian/osmo-trx-uhd.service M debian/osmo-trx-usrp1.install D debian/osmo-trx-usrp1.service M debian/patches/build-for-debian8.patch M debian/rules 12 files changed, 47 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 8ab73a6..38cd88d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,7 @@ CommonLibs \ GSM \ Transceiver52M \ + contrib \ tests EXTRA_DIST = \ @@ -41,6 +42,9 @@ COPYING \ README +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + .PHONY: release @RELMAKE@ diff --git a/configure.ac b/configure.ac index daa8677..64e3b35 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,22 @@ AC_CHECK_HEADER([boost/config.hpp],[], [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) + # https://www.freedesktop.org/software/systemd/man/daemon.html + AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) + AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) + AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) + AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) @@ -247,6 +263,8 @@ tests/Transceiver52M/Makefile \ doc/Makefile \ doc/examples/Makefile \ + contrib/Makefile \ + contrib/systemd/Makefile \ ]) AC_OUTPUT diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..21fbb53 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,18 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = + +if DEVICE_UHD +SYSTEMD_SERVICES += osmo-trx-uhd.service +endif + +if DEVICE_USRP1 +SYSTEMD_SERVICES += osmo-trx-usrp1.service +endif + +if DEVICE_LMS +SYSTEMD_SERVICES += osmo-trx-lms.service +endif + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif # HAVE_SYSTEMD diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install index dd9d407..b58c862 100644 --- a/debian/osmo-trx-lms.install +++ b/debian/osmo-trx-lms.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-trx-lms.service /usr/bin/osmo-trx-lms /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/ diff --git a/debian/osmo-trx-lms.service b/debian/osmo-trx-lms.service deleted file mode 120000 index d2d697a..0000000 --- a/debian/osmo-trx-lms.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-trx-lms.service \ No newline at end of file diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install index 8944b13..b7ec5ca 100644 --- a/debian/osmo-trx-uhd.install +++ b/debian/osmo-trx-uhd.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-trx-uhd.service /usr/bin/osmo-trx-uhd /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/ /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/ diff --git a/debian/osmo-trx-uhd.service b/debian/osmo-trx-uhd.service deleted file mode 120000 index c67648f..0000000 --- a/debian/osmo-trx-uhd.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-trx-uhd.service \ No newline at end of file diff --git a/debian/osmo-trx-usrp1.install b/debian/osmo-trx-usrp1.install index c7e54b1..112a149 100644 --- a/debian/osmo-trx-usrp1.install +++ b/debian/osmo-trx-usrp1.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-trx-usrp1.service /usr/bin/osmo-trx-usrp1 /usr/share/usrp/rev2/std_inband.rbf /usr/share/usrp/rev4/std_inband.rbf diff --git a/debian/osmo-trx-usrp1.service b/debian/osmo-trx-usrp1.service deleted file mode 120000 index a7b33ad..0000000 --- a/debian/osmo-trx-usrp1.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-trx-usrp1.service \ No newline at end of file diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index d44eb2f..cd1f356 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -50,8 +50,8 @@ 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 +- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system ++ dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system override_dh_strip: dh_strip --dbg-package=osmo-trx-dbg diff --git a/debian/rules b/debian/rules index 8081162..68de706 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ 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 --with-lms --with-systemdsystemunitdir=/lib/systemd/system override_dh_strip: dh_strip --dbg-package=osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/10900 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: Ia1a4fb62dee35737ece1f3501f352501eba2449e Gerrit-Change-Number: 10900 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 Thu Sep 13 13:56:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:56:56 +0000 Subject: Change in osmo-hlr[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10892 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10892 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: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694 Gerrit-Change-Number: 10892 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:56:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:57:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:02 +0000 Subject: Change in osmo-hlr[master]: Move doc/Makefile.am to doc/examples/Makefile.am In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10914 ) Change subject: Move doc/Makefile.am to doc/examples/Makefile.am ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10914 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: I89ef3abe86e7ceb7b389ac1cb227ea065bfbce37 Gerrit-Change-Number: 10914 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:57:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:57:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:57:09 +0000 Subject: Change in osmo-hlr[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10892 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10892 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: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694 Gerrit-Change-Number: 10892 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:57: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 Sep 13 13:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:57:10 +0000 Subject: Change in osmo-hlr[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10892 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-hlr.install D debian/osmo-hlr.service M debian/rules 7 files changed, 32 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 8e18167..210e499 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ src \ include \ sql \ + contrib \ tests \ $(NULL) @@ -12,6 +13,9 @@ .version \ $(NULL) +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-gsup-client.pc diff --git a/configure.ac b/configure.ac index 16c8b51..368f1cc 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -103,6 +119,8 @@ include/Makefile libosmo-gsup-client.pc sql/Makefile + contrib/Makefile + contrib/systemd/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..520e720 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-hlr.service +systemdsystemunit_DATA = \ + osmo-hlr.service +endif diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 7991522..5a7c37b 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -1,3 +1,4 @@ +/lib/systemd/system/osmo-hlr.service /usr/bin/osmo-hlr /usr/bin/osmo-hlr-db-tool /usr/share/doc/osmo-hlr/sql/hlr.sql diff --git a/debian/osmo-hlr.service b/debian/osmo-hlr.service deleted file mode 120000 index 184f5aa..0000000 --- a/debian/osmo-hlr.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-hlr.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 1d8d8ab..9e97c6c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,3 +15,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10892 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: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694 Gerrit-Change-Number: 10892 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 Thu Sep 13 13:57:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:41 +0000 Subject: Change in osmo-ggsn[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10916 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10916 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: If41e69295ac23a61df138ceea83794059f111086 Gerrit-Change-Number: 10916 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:57: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 Sep 13 13:57:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:44 +0000 Subject: Change in osmo-ggsn[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10916 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: If41e69295ac23a61df138ceea83794059f111086 --- M debian/osmo-ggsn.install M doc/examples/Makefile.am 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-ggsn.install b/debian/osmo-ggsn.install index 17caef7..35724d2 100644 --- a/debian/osmo-ggsn.install +++ b/debian/osmo-ggsn.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-ggsn.cfg /lib/systemd/system/osmo-ggsn.service /usr/bin/osmo-ggsn /usr/bin/sgsnemu diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..d0b677c 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,8 @@ +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-ggsn.cfg + +EXTRA_DIST = osmo-ggsn.cfg + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10916 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: If41e69295ac23a61df138ceea83794059f111086 Gerrit-Change-Number: 10916 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 Sep 13 13:57:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:51 +0000 Subject: Change in osmo-sip-connector[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10925 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10925 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: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196 Gerrit-Change-Number: 10925 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:57: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 Sep 13 13:57:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:52 +0000 Subject: Change in osmo-sip-connector[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10925 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196 --- M Makefile.am M configure.ac M debian/osmo-sip-connector.install A doc/Makefile.am A doc/examples/Makefile.am 5 files changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 7c1e00c..84b252a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = src tests contrib +SUBDIRS = src tests contrib doc BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version diff --git a/configure.ac b/configure.ac index 1514faa..98fdc94 100644 --- a/configure.ac +++ b/configure.ac @@ -91,4 +91,6 @@ tests/Makefile contrib/Makefile contrib/systemd/Makefile + doc/Makefile + doc/examples/Makefile Makefile) diff --git a/debian/osmo-sip-connector.install b/debian/osmo-sip-connector.install index b776fda..335531f 100644 --- a/debian/osmo-sip-connector.install +++ b/debian/osmo-sip-connector.install @@ -1,2 +1,4 @@ +etc/osmocom/osmo-sip-connector.cfg lib/systemd/system/osmo-sip-connector.service usr/bin/osmo-sip-connector +usr/share/doc/osmo-sip-connector/examples/osmo-sip-connector/osmo-sip-connector.cfg diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..d3b851f --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,7 @@ +examples_sipcdir = $(docdir)/examples/osmo-sip-connector +examples_sipc_DATA = osmo-sip-connector.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-sip-connector.cfg + +EXTRA_DIST = osmo-sip-connector.cfg -- To view, visit https://gerrit.osmocom.org/10925 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: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196 Gerrit-Change-Number: 10925 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 Sep 13 13:57:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:58 +0000 Subject: Change in osmo-iuh[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10913 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10913 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: I7476a1db470d3bc3a833e7657ad29f266df51667 Gerrit-Change-Number: 10913 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:57: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 Sep 13 13:57:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:57:59 +0000 Subject: Change in osmo-iuh[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10913 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I7476a1db470d3bc3a833e7657ad29f266df51667 --- M debian/osmo-hnbgw.install M doc/examples/Makefile.am 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install index bb70ad5..f040f23 100644 --- a/debian/osmo-hnbgw.install +++ b/debian/osmo-hnbgw.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-hnbgw.cfg lib/systemd/system/osmo-hnbgw.service usr/bin/osmo-hnbgw usr/share/doc/osmo-iuh/examples/osmo-hnbgw.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 8f14fdc..7441d48 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,7 @@ +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-hnbgw.cfg + +EXTRA_DIST = osmo-hnbgw.cfg CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' -- To view, visit https://gerrit.osmocom.org/10913 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: I7476a1db470d3bc3a833e7657ad29f266df51667 Gerrit-Change-Number: 10913 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 Sep 13 13:58:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:04 +0000 Subject: Change in osmo-bsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10920 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10920 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: I87bc40fafa6269d99ccbfe49a61fc7ae4da62e80 Gerrit-Change-Number: 10920 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58: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 Sep 13 13:58:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:10 +0000 Subject: Change in osmo-bsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10897 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10897 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: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:58:23 +0000 Subject: Change in osmo-bsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10897 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10897 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: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:23 +0000 Subject: Change in osmo-msc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10896 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10896 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: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594 Gerrit-Change-Number: 10896 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:58:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:58:26 +0000 Subject: Change in osmo-bsc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10897 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-bsc.install D debian/osmo-bsc.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 2f0a786..60a5b4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,11 +13,15 @@ include \ src \ tests \ + contrib \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 54d6a83..c6fa9a1 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -183,4 +199,6 @@ tests/handover/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..5119adf --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-bsc.service +systemdsystemunit_DATA = \ + osmo-bsc.service +endif diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 5dc1e0f..651ddb3 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bsc.service usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg usr/share/doc/osmo-bsc/examples diff --git a/debian/osmo-bsc.service b/debian/osmo-bsc.service deleted file mode 120000 index ce03af1..0000000 --- a/debian/osmo-bsc.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 71ffbf1..ffc99db 100755 --- a/debian/rules +++ b/debian/rules @@ -42,8 +42,10 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10897 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: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 2 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 Thu Sep 13 13:58:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:58:27 +0000 Subject: Change in osmo-bsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10920 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I87bc40fafa6269d99ccbfe49a61fc7ae4da62e80 --- M debian/osmo-bsc.install M doc/examples/Makefile.am 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 651ddb3..8f91b03 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-bsc.cfg lib/systemd/system/osmo-bsc.service usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..9d8cd75 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,11 @@ +OSMOCONF_FILES = \ + osmo-bsc/osmo-bsc.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10920 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: I87bc40fafa6269d99ccbfe49a61fc7ae4da62e80 Gerrit-Change-Number: 10920 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 Sep 13 13:58:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:30 +0000 Subject: Change in osmo-mgw[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10918 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10918 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: I6926e989a130086f4b6c8277407377a4063f452f Gerrit-Change-Number: 10918 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58: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 Sep 13 13:58:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:34 +0000 Subject: Change in osmo-mgw[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10895 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10895 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: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c Gerrit-Change-Number: 10895 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58: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 Sep 13 13:58:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:58:47 +0000 Subject: Change in osmo-mgw[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10895 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10895 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: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c Gerrit-Change-Number: 10895 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 13:58:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:58:49 +0000 Subject: Change in osmo-mgw[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10895 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c --- M Makefile.am M configure.ac M contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-mgw.install D debian/osmo-mgw.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 3270e4f..1497f80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 9f021df..3e6581d 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -151,4 +167,5 @@ doc/Makefile doc/examples/Makefile contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index db6d0f5..ab410c7 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1 +1,3 @@ +SUBDIRS = systemd + EXTRA_DIST = ipa.py diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..c0d95ff --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-mgw.service +systemdsystemunit_DATA = \ + osmo-mgw.service +endif diff --git a/debian/osmo-mgw.install b/debian/osmo-mgw.install index 39f7c01..ad3d3c6 100644 --- a/debian/osmo-mgw.install +++ b/debian/osmo-mgw.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-mgw.service usr/bin/osmo-mgw usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg diff --git a/debian/osmo-mgw.service b/debian/osmo-mgw.service deleted file mode 120000 index 1e0664c..0000000 --- a/debian/osmo-mgw.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-mgw.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index d13e426..d67243c 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf # debmake generated override targets # Set options for ./configure @@ -29,4 +29,7 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system + # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg -- To view, visit https://gerrit.osmocom.org/10895 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: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c Gerrit-Change-Number: 10895 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 Thu Sep 13 13:58:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:58:49 +0000 Subject: Change in osmo-mgw[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10918 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I6926e989a130086f4b6c8277407377a4063f452f --- M debian/osmo-mgw.install M doc/examples/Makefile.am 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-mgw.install b/debian/osmo-mgw.install index ad3d3c6..6f44961 100644 --- a/debian/osmo-mgw.install +++ b/debian/osmo-mgw.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-mgw.cfg lib/systemd/system/osmo-mgw.service usr/bin/osmo-mgw usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..da504f4 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,11 @@ +OSMOCONF_FILES = \ + osmo-mgw/osmo-mgw.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10918 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: I6926e989a130086f4b6c8277407377a4063f452f Gerrit-Change-Number: 10918 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 Sep 13 13:58:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10904 ) Change subject: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10904 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: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7 Gerrit-Change-Number: 10904 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58: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 Sep 13 13:58:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 13:58:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10904 ) Change subject: MSC_ConnectionHandler: stop properly on failure in f_establish_fully() ...................................................................... MSC_ConnectionHandler: stop properly on failure in f_establish_fully() When the altstep in f_establish_fully() gets an unexpected ASSIGNMENT FAIL or COMPLETE it should stop completely like it is already implemented in many other altsteps. Change-Id: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 10 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/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 102c30e..9f67f1b 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -939,18 +939,28 @@ (not st.is_assignment and (st.modify_done or not exp_modify))) and exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE"); + all component.stop; + mtc.stop; } [exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { setverdict(fail, "Received unexpected ASSIGNMENT FAIL"); + all component.stop; + mtc.stop; } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { setverdict(fail, "Received unexpected ASSIGNMENT COMPLETE"); + all component.stop; + mtc.stop; } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { setverdict(fail, "Received non-matching ASSIGNMENT FAIL"); + all component.stop; + mtc.stop; } [] T.timeout { setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE"); + all component.stop; + mtc.stop; } } log("g_media ", g_media); -- To view, visit https://gerrit.osmocom.org/10904 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: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7 Gerrit-Change-Number: 10904 Gerrit-PatchSet: 2 Gerrit-Owner: dexter 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 Sep 13 13:59:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:09 +0000 Subject: Change in osmo-msc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10896 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10896 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: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594 Gerrit-Change-Number: 10896 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:59: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 Sep 13 13:59:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:10 +0000 Subject: Change in osmo-msc[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10896 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-msc.install D debian/osmo-msc.service M debian/rules 7 files changed, 31 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 2f0a786..9f3644f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,12 +12,16 @@ doc \ include \ src \ + contrib \ tests \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 03acc0c..2d8dc42 100644 --- a/configure.ac +++ b/configure.ac @@ -181,6 +181,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -203,4 +219,6 @@ tests/msc_vlr/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..8648172 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-msc.service +systemdsystemunit_DATA = \ + osmo-msc.service +endif diff --git a/debian/osmo-msc.install b/debian/osmo-msc.install index 6b84b8f..1e7f22f 100644 --- a/debian/osmo-msc.install +++ b/debian/osmo-msc.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-msc.service usr/bin/osmo-msc usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc.cfg usr/share/doc/osmo-msc/examples usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc_custom-sccp.cfg usr/share/doc/osmo-msc/examples diff --git a/debian/osmo-msc.service b/debian/osmo-msc.service deleted file mode 120000 index 784b8b5..0000000 --- a/debian/osmo-msc.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-msc.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 15e79da..1cf3a35 100755 --- a/debian/rules +++ b/debian/rules @@ -42,11 +42,11 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf # debmake generated override targets # Set options for ./configure -CONFIGURE_FLAGS += --enable-iu --enable-smpp +CONFIGURE_FLAGS += --enable-iu --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10896 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: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594 Gerrit-Change-Number: 10896 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 Thu Sep 13 13:59:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:21 +0000 Subject: Change in osmo-bts[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10921 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change cfg file names so they don't overlap when installing different osmo-bts versions, and make systemd services look for correct new name. Remove unneeded duplicated EXTRA_DIST files from root dir Makefile.am Change-Id: I75fdd06cc52ce50628efb1f9b007d2e3926db27d --- M Makefile.am M contrib/systemd/osmo-bts-lc15.service M contrib/systemd/osmo-bts-sysmo.service M contrib/systemd/osmo-bts-trx.service M debian/osmo-bts-trx.install M debian/osmo-bts-virtual.install M doc/examples/Makefile.am R doc/examples/litecell15/osmo-bts-lc15.cfg R doc/examples/octphy/osmo-bts-octphy.cfg R doc/examples/sysmo/osmo-bts-sysmo.cfg R doc/examples/trx/osmo-bts-trx.cfg R doc/examples/virtual/osmo-bts-virtual.cfg 12 files changed, 20 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index b573aa8..5b49bb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,6 @@ EXTRA_DIST = \ contrib/dump_docs.py contrib/screenrc-l1fwd \ contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \ - doc/examples/sysmo/osmo-bts.cfg \ - doc/examples/sysmo/sysmobts-mgr.cfg \ - doc/examples/virtual/openbsc-virtual.cfg \ - doc/examples/virtual/osmobts-virtual.cfg \ git-version-gen .version \ README.md diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service index 6aa9751..90e7fc2 100644 --- a/contrib/systemd/osmo-bts-lc15.service +++ b/contrib/systemd/osmo-bts-lc15.service @@ -5,7 +5,7 @@ Type=simple ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' -ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts-lc15.cfg -M ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' Restart=always diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 65b1f00..9255817 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -4,7 +4,7 @@ [Service] Type=simple ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' -ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts-sysmo.cfg -M ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness' ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s' Restart=always diff --git a/contrib/systemd/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service index cea8719..97c2b07 100644 --- a/contrib/systemd/osmo-bts-trx.service +++ b/contrib/systemd/osmo-bts-trx.service @@ -3,7 +3,7 @@ [Service] Type=simple -ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts.cfg +ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts-trx.cfg Restart=always RestartSec=2 diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install index 2343d25..004a7ed 100644 --- a/debian/osmo-bts-trx.install +++ b/debian/osmo-bts-trx.install @@ -1,4 +1,5 @@ +etc/osmocom/osmo-bts-trx.cfg lib/systemd/system/osmo-bts-trx.service usr/bin/osmo-bts-trx -usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg +usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx.cfg usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install index 0e6ca1b..f4d988f 100644 --- a/debian/osmo-bts-virtual.install +++ b/debian/osmo-bts-virtual.install @@ -1,5 +1,6 @@ +etc/osmocom/osmo-bts-virtual.cfg lib/systemd/system/osmo-bts-virtual.service usr/bin/osmo-bts-virtual usr/bin/osmo-bts-omldummy -usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg +usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmo-bts-virtual.cfg usr/share/doc/osmo-bts/examples/osmo-bts-virtual/openbsc-virtual.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index e4be5fc..241f579 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,38 +1,46 @@ +OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg doc_virtualdir = $(docdir)/examples/osmo-bts-virtual doc_virtual_DATA = \ - virtual/osmobts-virtual.cfg \ + virtual/osmo-bts-virtual.cfg \ virtual/openbsc-virtual.cfg EXTRA_DIST = $(doc_virtual_DATA) if ENABLE_SYSMOBTS doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo doc_sysmo_DATA = \ - sysmo/osmo-bts.cfg \ + sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg EXTRA_DIST += $(doc_sysmo_DATA) +OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg endif if ENABLE_TRX doc_trxdir = $(docdir)/examples/osmo-bts-trx doc_trx_DATA = \ - trx/osmo-bts.cfg \ + trx/osmo-bts-trx.cfg \ trx/osmo-bts-trx-calypso.cfg EXTRA_DIST += $(doc_trx_DATA) +OSMOCONF_FILES += trx/osmo-bts-trx.cfg endif if ENABLE_OCTPHY doc_octphydir = $(docdir)/examples/osmo-bts-octphy doc_octphy_DATA = \ octphy/osmo-bts-trx2dsp1.cfg \ - octphy/osmo-bts.cfg + octphy/osmo-bts-octphy.cfg EXTRA_DIST += $(doc_octphy_DATA) +OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg endif if ENABLE_LC15BTS doc_lc15dir = $(docdir)/examples/osmo-bts-lc15 doc_lc15_DATA = \ - litecell15/osmo-bts.cfg \ + litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg EXTRA_DIST += $(doc_lc15_DATA) +OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg endif + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) diff --git a/doc/examples/litecell15/osmo-bts.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg similarity index 100% rename from doc/examples/litecell15/osmo-bts.cfg rename to doc/examples/litecell15/osmo-bts-lc15.cfg diff --git a/doc/examples/octphy/osmo-bts.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg similarity index 100% rename from doc/examples/octphy/osmo-bts.cfg rename to doc/examples/octphy/osmo-bts-octphy.cfg diff --git a/doc/examples/sysmo/osmo-bts.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg similarity index 100% rename from doc/examples/sysmo/osmo-bts.cfg rename to doc/examples/sysmo/osmo-bts-sysmo.cfg diff --git a/doc/examples/trx/osmo-bts.cfg b/doc/examples/trx/osmo-bts-trx.cfg similarity index 100% rename from doc/examples/trx/osmo-bts.cfg rename to doc/examples/trx/osmo-bts-trx.cfg diff --git a/doc/examples/virtual/osmobts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg similarity index 100% rename from doc/examples/virtual/osmobts-virtual.cfg rename to doc/examples/virtual/osmo-bts-virtual.cfg -- To view, visit https://gerrit.osmocom.org/10921 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: I75fdd06cc52ce50628efb1f9b007d2e3926db27d Gerrit-Change-Number: 10921 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 Sep 13 13:59:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:26 +0000 Subject: Change in osmo-trx[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10924 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5 --- M debian/osmo-trx-lms.install M debian/osmo-trx-uhd.install M doc/examples/Makefile.am A doc/examples/osmo-trx-lms/osmo-trx-lms.cfg A doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg 5 files changed, 24 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install index b58c862..b89506a 100644 --- a/debian/osmo-trx-lms.install +++ b/debian/osmo-trx-lms.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-trx-lms.cfg lib/systemd/system/osmo-trx-lms.service /usr/bin/osmo-trx-lms /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/ diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install index b7ec5ca..77236ca 100644 --- a/debian/osmo-trx-uhd.install +++ b/debian/osmo-trx-uhd.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-trx-uhd.cfg lib/systemd/system/osmo-trx-uhd.service /usr/bin/osmo-trx-uhd /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/ diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..88d9142 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,4 +1,23 @@ -CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' +OSMOCONF_FILES = +osmoconfdir = $(sysconfdir)/osmocom + +if DEVICE_UHD +OSMOCONF_FILES += osmo-trx-uhd/osmo-trx-uhd.cfg +endif + +# if DEVICE_USRP1 +# TODO: no usrp1 sample file yet +# OSMOCONF_FILES += osmo-trx-usrp1/osmo-trx-usrp1.cfg +# endif + +if DEVICE_LMS +OSMOCONF_FILES += osmo-trx-lms/osmo-trx-lms.cfg +endif + +osmoconf_DATA = $(OSMOCONF_FILES) +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: for f in $$($(CFG_FILES)); do \ diff --git a/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg b/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg new file mode 120000 index 0000000..13ae04a --- /dev/null +++ b/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg @@ -0,0 +1 @@ +osmo-trx-limesdr.cfg \ No newline at end of file diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg new file mode 120000 index 0000000..11f2320 --- /dev/null +++ b/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg @@ -0,0 +1 @@ +osmo-trx-usrp_b200.cfg \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10924 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: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5 Gerrit-Change-Number: 10924 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 Sep 13 13:59:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:31 +0000 Subject: Change in openbsc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10926 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg R openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/smpp_test_runner.py M openbsc/tests/vty_test_runner.py 15 files changed, 34 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install index 828fb31..8f9b74f 100644 --- a/debian/osmo-bsc-mgcp.install +++ b/debian/osmo-bsc-mgcp.install @@ -1,2 +1,3 @@ +etc/osmocom/osmo-bsc-mgcp.cfg lib/systemd/system/osmo-bsc-mgcp.service usr/bin/osmo-bsc_mgcp diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install index d6cabe2..ba134d1 100644 --- a/debian/osmocom-bsc-nat.install +++ b/debian/osmocom-bsc-nat.install @@ -1,2 +1,3 @@ +/etc/osmocom/osmo-bsc-nat.cfg /lib/systemd/system/osmo-bsc-nat.service /usr/bin/osmo-bsc_nat diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install index 67c50cb..872333e 100644 --- a/debian/osmocom-bsc-sccplite.install +++ b/debian/osmocom-bsc-sccplite.install @@ -1,2 +1,3 @@ +/etc/osmocom/osmo-bsc-sccplite.cfg /lib/systemd/system/osmo-bsc-sccplite.service /usr/bin/osmo-bsc-sccplite diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install index 78e8f77..87ed7e2 100644 --- a/debian/osmocom-nitb.install +++ b/debian/osmocom-nitb.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-nitb.cfg /lib/systemd/system/osmo-nitb.service /usr/bin/osmo-nitb openbsc/contrib/*.py usr/bin/ diff --git a/openbsc/doc/examples/Makefile.am b/openbsc/doc/examples/Makefile.am index 530c3fa..2b8336f 100644 --- a/openbsc/doc/examples/Makefile.am +++ b/openbsc/doc/examples/Makefile.am @@ -1,3 +1,21 @@ + +OSMOCONF_FILES = \ + osmo-nitb/sysmobts/osmo-nitb.cfg \ + osmo-bsc_mgcp/osmo-bsc-mgcp.cfg + +if BUILD_NAT +OSMOCONF_FILES += osmo-bsc_nat/osmo-bsc-nat.cfg +endif + +if BUILD_BSC +OSMOCONF_FILES += osmo-bsc-sccplite/osmo-bsc-sccplite.cfg +endif + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg similarity index 100% rename from openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg rename to openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg diff --git a/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg similarity index 100% rename from openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg rename to openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg similarity index 100% rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg rename to openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg similarity index 100% rename from openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg rename to openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg diff --git a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg similarity index 100% rename from openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg rename to openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg diff --git a/openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg similarity index 100% rename from openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg rename to openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index c5b20ac..5b01e4c 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -20,19 +20,19 @@ "doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg", "doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg", "doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg", - "doc/examples/osmo-nitb/bs11/openbsc.cfg", + "doc/examples/osmo-nitb/bs11/osmo-nitb.cfg", "doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg", "doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg", - "doc/examples/osmo-nitb/rbs2308/openbsc.cfg" + "doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg" ] app_configs = { "osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"], - "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"], - "mgcp": ["doc/examples/osmo-bsc_mgcp/mgcp.cfg"], + "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"], + "mgcp": ["doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"], "nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg", - "doc/examples/osmo-nitb/nanobts/openbsc.cfg"], + "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"], } @@ -43,6 +43,6 @@ ] vty_command = ["./src/osmo-nitb/osmo-nitb", "-c", - "doc/examples/osmo-nitb/nanobts/openbsc.cfg"] + "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"] vty_app = apps[3] # reference apps[] entry for osmo-nitb diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index cf83fad..d76ed65 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -468,7 +468,7 @@ def ctrl_command(self): return ["./src/osmo-nitb/osmo-nitb", "-c", - "doc/examples/osmo-nitb/nanobts/openbsc.cfg", "-l", "test_hlr.sqlite3"] + "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg", "-l", "test_hlr.sqlite3"] def ctrl_app(self): return (4249, "./src/osmo-nitb/osmo-nitb", "OsmoBSC", "nitb") @@ -577,7 +577,7 @@ def ctrl_command(self): return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-c", - "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"] + "doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"] def ctrl_app(self): return (4250, "./src/osmo-bsc_nat/osmo-bsc_nat", "OsmoNAT", "nat") diff --git a/openbsc/tests/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py index 2fd144b..58645aa 100644 --- a/openbsc/tests/smpp_test_runner.py +++ b/openbsc/tests/smpp_test_runner.py @@ -64,7 +64,7 @@ def vty_command(self): return ["./src/osmo-nitb/osmo-nitb", "-c", - "doc/examples/osmo-nitb/nanobts/openbsc.cfg"] + "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"] def vty_app(self): return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb") diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index a3161fb..5afcd2e 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -66,7 +66,7 @@ class TestVTYMGCP(TestVTYBase): def vty_command(self): return ["./src/osmo-bsc_mgcp/osmo-bsc_mgcp", "-c", - "doc/examples/osmo-bsc_mgcp/mgcp.cfg"] + "doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"] def vty_app(self): return (4243, "./src/osmo-bsc_mgcp/osmo-bsc_mgcp", "OpenBSC MGCP", "mgcp") @@ -170,7 +170,7 @@ def vty_command(self): return ["./src/osmo-nitb/osmo-nitb", "-c", - "doc/examples/osmo-nitb/nanobts/openbsc.cfg"] + "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"] def vty_app(self): return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb") @@ -765,7 +765,7 @@ def vty_command(self): return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-l", "127.0.0.1", "-c", - "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"] + "doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"] def vty_app(self): return (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat") -- To view, visit https://gerrit.osmocom.org/10926 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: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 6 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 Sep 13 13:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:47 +0000 Subject: Change in osmo-hlr[master]: Move doc/Makefile.am to doc/examples/Makefile.am In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10914 ) Change subject: Move doc/Makefile.am to doc/examples/Makefile.am ...................................................................... Move doc/Makefile.am to doc/examples/Makefile.am Change-Id: I89ef3abe86e7ceb7b389ac1cb227ea065bfbce37 --- M configure.ac M doc/Makefile.am A doc/examples/Makefile.am 3 files changed, 24 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 368f1cc..99f7829 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,7 @@ AC_OUTPUT( Makefile doc/Makefile + doc/examples/Makefile src/Makefile src/gsupclient/Makefile include/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index e0e5380..aee2d7b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,22 +1 @@ -CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' - -dist-hook: - for f in $$($(CFG_FILES)); do \ - j="$(distdir)/$$f" && \ - mkdir -p "$$(dirname $$j)" && \ - $(INSTALL_DATA) $(srcdir)/$$f $$j; \ - done - -install-data-hook: - for f in $$($(CFG_FILES)); do \ - j="$(DESTDIR)$(docdir)/$$f" && \ - mkdir -p "$$(dirname $$j)" && \ - $(INSTALL_DATA) $(srcdir)/$$f $$j; \ - done - -uninstall-hook: - @$(PRE_UNINSTALL) - for f in $$($(CFG_FILES)); do \ - j="$(DESTDIR)$(docdir)/$$f" && \ - $(RM) $$j; \ - done +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..530c3fa --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,22 @@ +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done -- To view, visit https://gerrit.osmocom.org/10914 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: I89ef3abe86e7ceb7b389ac1cb227ea065bfbce37 Gerrit-Change-Number: 10914 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 Sep 13 13:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 13:59:47 +0000 Subject: Change in osmo-hlr[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10915 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I2ac73f426d9489fcd64c2eea547eb1f3ec26ae2c --- M debian/osmo-hlr.install M doc/examples/Makefile.am 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 5a7c37b..1b2cb56 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-hlr.cfg /lib/systemd/system/osmo-hlr.service /usr/bin/osmo-hlr /usr/bin/osmo-hlr-db-tool diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..fa8ab9b 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,8 @@ +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-hlr.cfg + +EXTRA_DIST = osmo-hlr.cfg + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10915 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: I2ac73f426d9489fcd64c2eea547eb1f3ec26ae2c Gerrit-Change-Number: 10915 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 Sep 13 14:08:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:08:40 +0000 Subject: Change in osmo-msc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10919 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10919 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: I19f3755f7637dfc017a89f503831f7df8098a919 Gerrit-Change-Number: 10919 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 14:08: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 Sep 13 14:09:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:09:29 +0000 Subject: Change in osmo-msc[master]: Install sample cfg file to /etc/osmocom In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10919 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I19f3755f7637dfc017a89f503831f7df8098a919 --- M debian/osmo-msc.install M doc/examples/Makefile.am 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-msc.install b/debian/osmo-msc.install index 1e7f22f..e4b9646 100644 --- a/debian/osmo-msc.install +++ b/debian/osmo-msc.install @@ -1,3 +1,4 @@ +etc/osmocom/osmo-msc.cfg lib/systemd/system/osmo-msc.service usr/bin/osmo-msc usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc.cfg usr/share/doc/osmo-msc/examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 530c3fa..af36318 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,11 @@ +OSMOCONF_FILES = \ + osmo-msc/osmo-msc.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' dist-hook: -- To view, visit https://gerrit.osmocom.org/10919 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: I19f3755f7637dfc017a89f503831f7df8098a919 Gerrit-Change-Number: 10919 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 Sep 13 14:11:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 14:11:17 +0000 Subject: Change in libosmocore[master]: fix tests linking: don't use system installed libs In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/5844 ) Change subject: fix tests linking: don't use system installed libs ...................................................................... fix tests linking: don't use system installed libs Do not link against the system-wide installed libosmo* libs when building the regression test programs. Always use the locally built ones. Linking some libosmo libraries causes libtool to pull in other libosmo libs even though they were not explicitly named. For example, ctrl_test explicitly links libosmoctrl, but this also has dependencies to libosmovty and libosmogsm: ldd src/ctrl/.libs/libosmoctrl.so | grep osmo libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f26c26d4000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f26c22bb000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f26c2171000) If we omit explicit LDADD of these dependencies in the Makefile.am, libtool will take the first canonical place to find them, which may just be the already installed older versions of the same libs, which may or may not be compatible with the current build. In any case, it is never intended to link installed libs. All library dependencies are listed by this quick script: cd libosmocore for l in $(find . -name "*.so") ; do echo; echo "$l"; ldd $l | grep libosmo; done ./.libs/libosmocore.so ./coding/.libs/libosmocoding.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f25fc3c2000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f25fbfa9000) libosmocodec.so.0 => /usr/local/lib/libosmocodec.so.0 (0x00007f25fbf9b000) ./codec/.libs/libosmocodec.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fb4c900d000) ./ctrl/.libs/libosmoctrl.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f5df5129000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f5df4d10000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f5df4bc6000) ./gb/.libs/libosmogb.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f788e536000) libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f788e3ec000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f788dfd3000) ./vty/.libs/libosmovty.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f3b7ed21000) ./gsm/.libs/libosmogsm.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fc69472e000) ./sim/.libs/libosmosim.so libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f2f6412d000) libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f2f63d14000) Add all explicit linking of all required library dependencies in all regression test programs, as shown by above listing. Example for reproducing a problem: In libosmocore.a, introduce a new function, and call that from libosmovty code. For example, I made loglevel_strs non-static in logging.c, and used that in logging_vty.c. Build and install this in a place where libtool can find it. Then go back to before this change and rebuild. You will see that linking ctrl_test (before this patch) then complains about libosmovty requiring the loglevel_strs symbol which it cannot find in libosmocore.so. Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 --- M tests/Makefile.am 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 072bb4a..5d07695 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -76,7 +76,10 @@ abis_abis_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la ctrl_ctrl_test_SOURCES = ctrl/ctrl_test.c -ctrl_ctrl_test_LDADD = $(LDADD) $(top_builddir)/src/ctrl/libosmoctrl.la +ctrl_ctrl_test_LDADD = $(LDADD) \ + $(top_builddir)/src/ctrl/libosmoctrl.la \ + $(top_builddir)/src/gsm/libosmogsm.la \ + $(top_builddir)/src/vty/libosmovty.la gea_gea_test_SOURCES = gea/gea_test.c gea_gea_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la @@ -130,20 +133,24 @@ gb_bssgp_fc_test_SOURCES = gb/bssgp_fc_test.c gb_bssgp_fc_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \ + $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ + $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ + $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la logging_logging_test_SOURCES = logging/logging_test.c fr_fr_test_SOURCES = fr/fr_test.c fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ + $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la codec_codec_test_SOURCES = codec/codec_test.c @@ -177,7 +184,11 @@ oap_oap_client_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la fsm_fsm_test_SOURCES = fsm/fsm_test.c -fsm_fsm_test_LDADD = $(LDADD) $(top_builddir)/src/ctrl/libosmoctrl.la +fsm_fsm_test_LDADD = \ + $(LDADD) \ + $(top_builddir)/src/ctrl/libosmoctrl.la \ + $(top_builddir)/src/gsm/libosmogsm.la \ + $(top_builddir)/src/vty/libosmovty.la write_queue_wqueue_test_SOURCES = write_queue/wqueue_test.c -- To view, visit https://gerrit.osmocom.org/5844 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: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 Gerrit-Change-Number: 5844 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:11:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 14:11:59 +0000 Subject: Change in libosmocore[master]: logging vty: write: check logging levels validity 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/10887 to look at the new patch set (#2). Change subject: logging vty: write: check logging levels validity ...................................................................... logging vty: write: check logging levels validity Change-Id: If683b1272ad2d5b402b91c52c496aa7975bc6315 --- M include/osmocom/core/logging_internal.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/10887/2 -- To view, visit https://gerrit.osmocom.org/10887 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: If683b1272ad2d5b402b91c52c496aa7975bc6315 Gerrit-Change-Number: 10887 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 Sep 13 14:12:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 14:12:19 +0000 Subject: Change in libosmocore[master]: logging: define lower-case loglevel value_string[] In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/10886 ) Change subject: logging: define lower-case loglevel value_string[] ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10886 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: Ie55d732281bdf74324e1dd7f8a2ba91d11409851 Gerrit-Change-Number: 10886 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:12:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 14:12:47 +0000 Subject: Change in libosmocore[master]: logging vty: add VTY transcript test In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10883 ) Change subject: logging vty: add VTY transcript test ...................................................................... logging vty: add VTY transcript test I am setting out to refactor various details about logging. To show the effect, I am first adding this new test to illustrate the exact effects on the various osmo programs. Add logging_vty_test.c as a standalone program that simply defines a few logging categories and opens a telnet vty to play with. Add logging_vty_test.vty, as an osmo_verify_transcript_vty.py test script. Add --enable-external-tests to configure.ac, to enable running logging_vty_test.vty during 'make check'. Also allow running 'make vty-test' without the need to first configure with --enable-external-tests (a flexibility I've missed many times over in the other osmo source trees). Add a Makefile.am stub for external CTRL tests, basically a copy-paste from osmo-msc.git. I doubt that libosmocore will get python driven CTRL interface testing any time soon, but if so we will know to not run it concurrently. Change-Id: I948e832a33131f8eab98651d6010ceb0ccbc9a9c --- M configure.ac M tests/Makefile.am A tests/logging/logging_vty_test.c A tests/logging/logging_vty_test.vty 4 files changed, 530 insertions(+), 1 deletion(-) 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/configure.ac b/configure.ac index dd5f15b..bc3358a 100644 --- a/configure.ac +++ b/configure.ac @@ -296,6 +296,21 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AM_PATH_PYTHON + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + 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]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + CFLAGS="$CFLAGS -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS="$CPPFLAGS -DBUILDING_LIBOSMOCORE -Wall" diff --git a/tests/Makefile.am b/tests/Makefile.am index 5d07695..18d4bb4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,9 @@ abis/abis_test endian/endian_test sercomm/sercomm_test \ prbs/prbs_test gsm23003/gsm23003_test \ codec/codec_ecu_fr_test timer/clk_override_test \ - oap/oap_client_test + oap/oap_client_test \ + logging/logging_vty_test \ + $(NULL) if ENABLE_MSGFILE check_PROGRAMS += msgfile/msgfile_test @@ -148,6 +150,9 @@ logging_logging_test_SOURCES = logging/logging_test.c +logging_logging_vty_test_SOURCES = logging/logging_vty_test.c +logging_logging_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la + fr_fr_test_SOURCES = fr/fr_test.c fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/vty/libosmovty.la \ @@ -280,6 +285,7 @@ check-local: atconfig $(TESTSUITE) cat /proc/cpuinfo $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + $(MAKE) $(AM_MAKEFLAGS) ext-tests installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ @@ -298,3 +304,25 @@ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ --target-path $(builddir)/conv + +if ENABLE_EXT_TESTS +ext-tests: +# don't run vty and ctrl tests concurrently so that the ports don't conflict + $(MAKE) vty-test + $(MAKE) ctrl-test +else +ext-tests: + echo "Not running python-based external tests (determined at configure-time)" +endif + +# To update the VTY script from current application behavior, +# pass -u to osmo_verify_transcript_vty.py by doing: +# make vty-test U=-u +vty-test: + osmo_verify_transcript_vty.py -v \ + -p 42042 \ + -r "$(top_builddir)/tests/logging/logging_vty_test" \ + $(U) $(srcdir)/logging/*.vty + +ctrl-test: + echo "No CTRL tests exist currently" diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c new file mode 100644 index 0000000..806a460 --- /dev/null +++ b/tests/logging/logging_vty_test.c @@ -0,0 +1,296 @@ +/* test program with a vty interface to test logging behavior */ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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. + * + */ + +#define _GNU_SOURCE +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "config.h" + +void *root_ctx = NULL; + +enum { + DAA, + DBB, + DCCC, + DDDDD, + DEEE, +}; + +DEFUN(log_sweep, log_sweep_cmd, + "log-sweep [CATEGORY]", + "Log once for all categories on all levels\n") +{ + int only_category = argc ? log_parse_category(argv[0]) : -1; + + if (argc && only_category < 0) { + vty_out(vty, "%% Error: unknown category: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + +#define LOG_LEVEL(CAT, LEVEL) \ + if (only_category < 0 || only_category == CAT) \ + LOGP(CAT, LEVEL, "Log message for " #CAT " on level " #LEVEL "\n") + +#define LOG_ALL_LEVELS(CAT) \ + LOG_LEVEL(CAT, LOGL_DEBUG); \ + LOG_LEVEL(CAT, LOGL_INFO); \ + LOG_LEVEL(CAT, LOGL_NOTICE); \ + LOG_LEVEL(CAT, LOGL_ERROR); \ + LOG_LEVEL(CAT, LOGL_FATAL) + + LOG_ALL_LEVELS(DAA); + LOG_ALL_LEVELS(DBB); + LOG_ALL_LEVELS(DCCC); + LOG_ALL_LEVELS(DDDDD); + LOG_ALL_LEVELS(DEEE); + + vty_out(vty, "%s", VTY_NEWLINE); + + return CMD_SUCCESS; +} + +static void vty_commands_init() +{ + install_element_ve(&log_sweep_cmd); +} + +static const struct log_info_cat default_categories[] = { + [DAA] = { + .name = "DAA", + .description = "Antropomorphic Armadillos (AA)", + .color = "\033[1;31m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, + [DBB] = { + .name = "DBB", + .description = "Bidirectional Breadspread (BB)", + .color = "\033[1;32m", + .enabled = 1, .loglevel = LOGL_INFO, + }, + [DCCC] = { + .name = "DCCC", + .description = "Chaos Communication Congress (CCC)", + .color = "\033[1;33m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DDDDD] = { + .name = "DDDDD", + .description = "Dehydrated Dribbling Duck Dunkers (DDDD)", + .color = "\033[1;34m", + .enabled = 1, .loglevel = LOGL_ERROR, + }, + [DEEE] = { + .name = "DEEE", + .description = "Exhaustive Entropy Extraction (EEE)", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_FATAL, + }, +}; + +const struct log_info log_info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +static void print_help() +{ + printf( "options:\n" + " -h --help this text\n" + " -d --debug MASK Enable debugging (e.g. -d DRSL:DOML:DLAPDM)\n" + " -D --daemonize For the process into a background daemon\n" + " -c --config-file Specify the filename of the config file\n" + " -s --disable-color Don't use colors in stderr log output\n" + " -T --timestamp Prefix every log line with a timestamp\n" + " -V --version Print version information and exit\n" + " -e --log-level Set a global log-level\n" + ); +} + +static struct { + const char *config_file; + int daemonize; +} cmdline_config = {}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_idx = 0, c; + static const struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "debug", 1, 0, 'd' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "disable-color", 0, 0, 's' }, + { "timestamp", 0, 0, 'T' }, + { "version", 0, 0, 'V' }, + { "log-level", 1, 0, 'e' }, + {} + }; + + c = getopt_long(argc, argv, "hc:d:Dc:sTVe:", + long_options, &option_idx); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_config.daemonize = 1; + break; + case 'c': + cmdline_config.config_file = optarg; + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + } + } +} + +static int quit = 0; + +static void signal_handler(int signal) +{ + fprintf(stdout, "signal %u received\n", signal); + + switch (signal) { + case SIGINT: + case SIGTERM: + quit++; + break; + case SIGABRT: + osmo_generate_backtrace(); + /* in case of abort, we want to obtain a talloc report + * and then return to the caller, who will abort the process */ + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(root_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static struct vty_app_info vty_info = { + .name = "logging_vty_test", + .version = PACKAGE_VERSION, +}; + +int main(int argc, char **argv) +{ + int rc; + + root_ctx = talloc_named_const(NULL, 0, "logging_vty_test"); + + vty_info.tall_ctx = root_ctx; + vty_init(&vty_info); + + osmo_init_logging2(root_ctx, &log_info); + + vty_commands_init(); + + handle_options(argc, argv); + + logging_vty_add_cmds(&log_info); + osmo_talloc_vty_add_cmds(); + + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + + if (cmdline_config.config_file) { + rc = vty_read_config_file(cmdline_config.config_file, NULL); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + cmdline_config.config_file); + return 1; + } + } + + rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + if (rc < 0) + return 2; + + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + + if (cmdline_config.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + return 6; + } + } + + while (!quit) { + log_reset_context(); + osmo_select_main(0); + } + + log_fini(); + + talloc_free(root_ctx); + talloc_free(tall_vty_ctx); + + return 0; +} diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty new file mode 100644 index 0000000..c57b70f --- /dev/null +++ b/tests/logging/logging_vty_test.vty @@ -0,0 +1,190 @@ +logging_vty_test> enable + +logging_vty_test# ! Note that 'logging level all everything' is still printed! +logging_vty_test# show running-config +... +log stderr +... + logging level all everything + logging level aa debug + logging level bb info + logging level ccc notice + logging level dddd error + logging level eee fatal +... + +logging_vty_test# configure terminal +logging_vty_test(config)# no log stderr +logging_vty_test(config)# exit + +logging_vty_test# logging enable +logging_vty_test# logging filter all 1 +logging_vty_test# logging print category-hex 0 +logging_vty_test# logging print category 1 +logging_vty_test# logging print level 1 +logging_vty_test# logging color 0 +logging_vty_test# logging print file 0 + + +logging_vty_test# list +... !logging + logging enable + logging disable + logging filter all (0|1) + logging color (0|1) + logging timestamp (0|1) + logging print extended-timestamp (0|1) + logging print category (0|1) + logging print category-hex (0|1) + logging print level (0|1) + logging print file (0|1|basename) [last] + logging set-log-mask MASK + logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (everything|debug|info|notice|error|fatal) + show logging vty +... !logging + +logging_vty_test# logging ? + enable Enables logging to this vty + disable Disables logging to this vty + filter Filter log messages + color Configure color-printing for log messages + timestamp Configure log message timestamping + print Log output settings + set-log-mask Set the logmask of this logging target + level Set the log level for a specified category + +logging_vty_test# logging level ? + all Global setting for all subsystems + aa Antropomorphic Armadillos (AA) + bb Bidirectional Breadspread (BB) + ccc Chaos Communication Congress (CCC) + dddd Dehydrated Dribbling Duck Dunkers (DDDD) + eee Exhaustive Entropy Extraction (EEE) + lglobal Library-internal global log family +... + +logging_vty_test# logging level aa ? + everything Don't use. It doesn't log anything + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + +logging_vty_test# logging level all ? + everything Don't use. It doesn't log anything + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + + +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all error +logging_vty_test# log-sweep +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all notice +logging_vty_test# log-sweep +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB DEBUG Log message for DBB on level LOGL_DEBUG +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC DEBUG Log message for DCCC on level LOGL_DEBUG +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE DEBUG Log message for DEEE on level LOGL_DEBUG +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! 'logging level all' overrides everything, be it stronger or weaker +logging_vty_test# logging level all notice +logging_vty_test# logging level eee debug +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level all notice +logging_vty_test# logging level eee fatal +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! Old 'logging level all everything' has no effect +logging_vty_test# logging level all everything +% Ignoring deprecated logging level everything +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! There is currently no way to remove the 'logging level all' level! -- To view, visit https://gerrit.osmocom.org/10883 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: I948e832a33131f8eab98651d6010ceb0ccbc9a9c Gerrit-Change-Number: 10883 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:13:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 14:13:55 +0000 Subject: Change in libosmocore[master]: logging vty: write: check logging levels validity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10887 ) Change subject: logging vty: write: check logging levels validity ...................................................................... Patch Set 2: Code-Review+2 this has just seen merge conflict resolution after abandoning the loglevel_strs_lower[] array. re-adding +2 -- To view, visit https://gerrit.osmocom.org/10887 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: If683b1272ad2d5b402b91c52c496aa7975bc6315 Gerrit-Change-Number: 10887 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 13 Sep 2018 14:13:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:14:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:14:02 +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 3: 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: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 14:14:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:14:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:14:12 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/testdata/repo-install-test.sh File debian-repo-install-test/testdata/repo-install-test.sh: https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/testdata/repo-install-test.sh at 49 PS6, Line 49: osmo-bsc --version it's not really the task at hand, but in the past we also had the problem that some packages would generate UNKNOWN as version string. So as we're calling all binaries with --version anyway, it might be a good idea to also check that there's no UNKNOWN string present in the output? I guess the best would be to add the above new test as a new function, so the test output (ends up in jenkins console log) would clearly state what failed. Feel free to come up with whatever way you think is best, and we should do this in a follow-up patch to this current patch. -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Sep 2018 14:14:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:15:04 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: Code-Review+1 I would +2 it, but I'll give Neels the last word. -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Sep 2018 14:15: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 Sep 13 14:26:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:26:23 +0000 Subject: Change in osmo-bts[master]: measurement: fix unit-test test_lchan_meas_process_measurement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10815 ) Change subject: measurement: fix unit-test test_lchan_meas_process_measurement ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10815 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: I9e00ce683e8c44528804f65181dbfed9e85e3aed Gerrit-Change-Number: 10815 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 14: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 Thu Sep 13 14:26:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:26:35 +0000 Subject: Change in openbsc[master]: cosmetic: Remove duplicate semicolon and whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10934 Change subject: cosmetic: Remove duplicate semicolon and whitespace ...................................................................... cosmetic: Remove duplicate semicolon and whitespace Change-Id: Ib36b8937d1210488784ebae6917cb1b4c871c9d4 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/10934/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 45f53bc..0c91d04 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1208,7 +1208,7 @@ } /* hand data to a side channel */ - if (bsc_ussd_check(con, parsed, msg) == 1) + if (bsc_ussd_check(con, parsed, msg) == 1) con->con_local = NAT_CON_END_USSD; /* @@ -1703,7 +1703,7 @@ nat->msc_con->connection_loss = msc_connection_was_lost; nat->msc_con->connected = msc_connection_connected; nat->msc_con->write_queue.read_cb = ipaccess_msc_read_cb; - nat->msc_con->write_queue.write_cb = ipaccess_msc_write_cb;; + nat->msc_con->write_queue.write_cb = ipaccess_msc_write_cb; nat->msc_con->write_queue.bfd.data = nat->msc_con; bsc_msc_connect(nat->msc_con); -- To view, visit https://gerrit.osmocom.org/10934 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: Ib36b8937d1210488784ebae6917cb1b4c871c9d4 Gerrit-Change-Number: 10934 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 Sep 13 14:26:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:26:42 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10908 ) Change subject: cosmetic: fix typo in comment ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10908 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: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c Gerrit-Change-Number: 10908 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 14:26: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 Sep 13 14:27:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:10 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10814 ) Change subject: measurement: remove missed interval end detection ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 13 Sep 2018 14:27:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:27:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:13 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10908 ) Change subject: cosmetic: fix typo in comment ...................................................................... cosmetic: fix typo in comment Change-Id: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c --- M src/common/measurement.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/common/measurement.c b/src/common/measurement.c index 1e547c8..8f0470a 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -823,7 +823,7 @@ /* 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 + * measurement samples and automatically detects the end of the measurement * interval. */ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { -- To view, visit https://gerrit.osmocom.org/10908 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: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c Gerrit-Change-Number: 10908 Gerrit-PatchSet: 4 Gerrit-Owner: dexter 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 Sep 13 14:27:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:13 +0000 Subject: Change in osmo-bts[master]: measurement: remove missed interval end detection In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10814 ) Change subject: measurement: remove missed interval end detection ...................................................................... measurement: remove missed interval end detection The function is_meas_overdue() was introduced to allow lchan_meas_process_measurement() to detect when the end of a measurement interval has been missed. Interval ends may be missed when the SACCH block of the related measurement interval gets lost. This is due to the fact that the SACCH block is used as a trigger to start the measurement result computation. The idea behind is_meas_overdue() was to check the frame number of the current measurement against the frame number of the previous measurement in order to see if there was a measurement for SACCH in between or not. Unfortunately SACCH and TCH Voice data is not necessarly processed in order by each phy. Depending on the phy there may be a jitter between the timing of SACCH and TCH Voice. Depending on the phy this jitter may be enough to mess up the timing so that we see a SACCH block earlier than expected. So we can not use the current frame number of TCH Voice measurements to check for missed SACCH blocks. Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Related: OS#3502 Related: OS#2975 --- 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, 2 insertions(+), 733 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/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index b4fc35b..a2367c8 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -16,6 +16,4 @@ 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 8f0470a..8d1babd 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -240,32 +240,6 @@ 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 * (this function is only used internally, it is public to call it from * unit-tests) */ @@ -322,99 +296,6 @@ return rc; } -/* 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; - uint32_t fn_rounded; - 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_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_by_ts; - else - 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_by_ss[lchan->nr]; - break; - case GSM_PCHAN_CCCH_SDCCH4: - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - modulus = 102; - interval_end = sdcch4_meas_rep_fn102_by_ss[lchan->nr]; - break; - default: - return false; - break; - } - - 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 - * 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_rounded; - 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_rounded - 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_rounded; - return true; - } - } - - return false; -} - /* determine the measurement interval modulus by a given lchan */ static uint8_t modulus_by_lchan(struct gsm_lchan *lchan) { @@ -827,31 +708,8 @@ * interval. */ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { - uint32_t fn_missed_end; - bool missed_end; - - /* 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); - } + lchan_new_ul_meas(lchan, ulm, fn); + lchan_meas_check_compute(lchan, fn); } /* Reset all measurement related struct members to their initial values. This diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index a33a808..8f50479 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -125,588 +125,6 @@ } -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()\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); - - /* 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, uint32_t fn_end, uint8_t intv_len) { @@ -1152,7 +570,6 @@ printf("*** MEASUREMENT INTERVAL ENDING DETECTION TESTS ***\n"); printf("***************************************************\n"); - test_is_meas_overdue(); test_is_meas_complete(); test_lchan_meas_process_measurement(false, false); test_lchan_meas_process_measurement(true, false); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 3d4f430..e62bb42 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -714,10 +714,6 @@ =========================================================== -Testing is_meas_overdue() - - -=========================================================== Testing is_meas_complete() -- To view, visit https://gerrit.osmocom.org/10814 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: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e Gerrit-Change-Number: 10814 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:27:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:13 +0000 Subject: Change in osmo-bts[master]: measurement: fix unit-test 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/10815 ) Change subject: measurement: fix unit-test test_lchan_meas_process_measurement ...................................................................... measurement: fix unit-test test_lchan_meas_process_measurement The unit test that tests lchan_meas_process_measurement() only inputs test data to lchan_meas_process_measurement() but it is not checked if the interval end could be detected or not. - Add a return code to lchan_meas_process_measurement() - Ensure that the return code is checked in the unit-test Change-Id: I9e00ce683e8c44528804f65181dbfed9e85e3aed Related: OS#2975 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c 3 files changed, 8 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/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index a2367c8..4f04ffa 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -8,7 +8,7 @@ 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); +int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); void lchan_meas_reset(struct gsm_lchan *lchan); diff --git a/src/common/measurement.c b/src/common/measurement.c index 8d1babd..33b1c11 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -706,10 +706,10 @@ * l1sap.c every time a measurement indication is received. It collects the * measurement samples and automatically detects the end of the measurement * interval. */ -void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { lchan_new_ul_meas(lchan, ulm, fn); - lchan_meas_check_compute(lchan, fn); + return lchan_meas_check_compute(lchan, fn); } /* Reset all measurement related struct members to their initial values. This diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 8f50479..d4f3fe6 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -315,6 +315,7 @@ unsigned int fn = 0; unsigned int fn104; struct bts_ul_meas ulm; + int rc; printf("\n\n"); printf("===========================================================\n"); @@ -347,7 +348,8 @@ 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); + rc = lchan_meas_process_measurement(lchan, &ulm, fn); + OSMO_ASSERT(rc == 0); } else if (ulm.is_sub == 1) printf("(leaving out SUB measurement sample for frame number %u)\n", fn); else @@ -363,7 +365,8 @@ if (fn % 104 == 39 && no_sacch == false) { 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); + rc = lchan_meas_process_measurement(lchan, &ulm, fn - 1); + OSMO_ASSERT(rc); } else if (fn % 104 == 39 && no_sacch == true) printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn); } -- To view, visit https://gerrit.osmocom.org/10815 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: I9e00ce683e8c44528804f65181dbfed9e85e3aed Gerrit-Change-Number: 10815 Gerrit-PatchSet: 5 Gerrit-Owner: dexter 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 Sep 13 14:27:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:26 +0000 Subject: Change in libosmocore[master]: gsm0808: implement BSSMAP Classmark Request In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10911 ) Change subject: gsm0808: implement BSSMAP Classmark Request ...................................................................... gsm0808: implement BSSMAP Classmark Request Related: OS#3043 Change-Id: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 5ae0af8..f4fc7c4 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -51,6 +51,7 @@ const uint8_t *cipher_response_mode); struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id); struct msgb *gsm0808_create_cipher_reject(uint8_t cause); +struct msgb *gsm0808_create_classmark_request(); struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); struct msgb *gsm0808_create_sapi_reject(uint8_t link_id); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e3b10d0..9a9f70e 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -341,6 +341,19 @@ return msg; } +/*! Create BSSMAP Classmark Request message + * \returns callee-allocated msgb with BSSMAP Classmark Request message */ +struct msgb *gsm0808_create_classmark_request() +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "classmark-request"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_CLASSMARK_RQST); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; +} /*! Create BSSMAP Classmark Update message * \param[in] cm2 Classmark 2 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 60d6ed8..0c40c88 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -156,6 +156,7 @@ gsm0808_create_cipher; gsm0808_create_cipher_complete; gsm0808_create_cipher_reject; +gsm0808_create_classmark_request; gsm0808_create_classmark_update; gsm0808_create_clear_command; gsm0808_create_clear_complete; -- To view, visit https://gerrit.osmocom.org/10911 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: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 Gerrit-Change-Number: 10911 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 Sep 13 14:27:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:47 +0000 Subject: Change in osmo-trx[master]: cosmetic: Use proper whitespace in several for loops In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10856 ) Change subject: cosmetic: Use proper whitespace in several for loops ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10856 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: I82bdeb8a3fa38f3d125e8cbccc3eddbf2b8d8f58 Gerrit-Change-Number: 10856 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 14:27:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 14:27:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Sep 2018 14:27:48 +0000 Subject: Change in osmo-trx[master]: cosmetic: Use proper whitespace in several for loops In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10856 ) Change subject: cosmetic: Use proper whitespace in several for loops ...................................................................... cosmetic: Use proper whitespace in several for loops Change-Id: I82bdeb8a3fa38f3d125e8cbccc3eddbf2b8d8f58 --- M Transceiver52M/device/usrp1/USRPDevice.cpp M tests/Transceiver52M/convolve_test.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 758ee55..5d19514 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -398,7 +398,7 @@ // read USRP packets, parse and save A/D data as needed readLen = m_uRx->read((void *)readBuf,readLen,overrun); - for(int pktNum = 0; pktNum < (readLen/512); pktNum++) { + for (int pktNum = 0; pktNum < (readLen/512); pktNum++) { // tmpBuf points to start of a USB packet uint32_t* tmpBuf = (uint32_t *) (readBuf+pktNum*512/4); TIMESTAMP pktTimestamp = usrp_to_host_u32(tmpBuf[1]); diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c index 88624af..54bc7a1 100644 --- a/tests/Transceiver52M/convolve_test.c +++ b/tests/Transceiver52M/convolve_test.c @@ -18,7 +18,7 @@ void gen_floats(float *vect, int len) { int i; - for(i=0;i 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 Sep 13 14:32:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:32:35 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10935 Change subject: nat: Remove misleading comment ...................................................................... nat: Remove misleading comment Code is already doing stuff with the connection (fd). Change-Id: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/10935/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0c91d04..7463f02 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1423,7 +1423,6 @@ if (rc != 0) LOGP(DNAT, LOGL_ERROR, "Failed to set IP_TOS: %s\n", strerror(errno)); - /* todo... do something with the connection */ /* todo... use GNUtls to see if we want to trust this as a BTS */ /* -- To view, visit https://gerrit.osmocom.org/10935 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: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 Gerrit-Change-Number: 10935 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 Sep 13 14:33:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:33:30 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10935 ) Change subject: nat: Remove misleading comment ...................................................................... nat: Remove misleading comment Code is already doing stuff with the connection (fd). Change-Id: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/10935/2 -- To view, visit https://gerrit.osmocom.org/10935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 Gerrit-Change-Number: 10935 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 Sep 13 14:45:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Sep 2018 14:45:41 +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_#697?= Message-ID: <1492228239.99.1536849941953.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 9.91 KB...] 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 to enable VTY/CTRL tests... no 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 configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.50-2c79 > .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/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit64gen.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 crc32gen.c GEN crc64gen.c GEN crc16gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC signal.lo CC msgb.lo CC select.lo CC timer_clockgettime.lo CC bitvec.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 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 crc8gen.lo CC loggingrb.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo /bin/bash: line 2: 739 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 conv_acc_generic.lo -MD -MP -MF $depbase.Tpo -c -o conv_acc_generic.lo conv_acc_generic.c Makefile:558: recipe for target 'conv_acc_generic.lo' failed make[3]: *** [conv_acc_generic.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: 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 Sep 13 14:47:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:47:26 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10936 Change subject: nat: Remove misleading comment ...................................................................... nat: Remove misleading comment PONG is being sent a as an answer to PING a few lines above in same function. Change-Id: I88ca95d46f4ace1da4025d12302422dbfa578354 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/36/10936/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0e69528..8cc0f2d 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1369,7 +1369,6 @@ return bsc_nat_handle_ctrlif_msg(bsc, msg); } - /* FIXME: Currently no PONG is sent to the BSC */ /* FIXME: Currently no ID ACK is sent to the BSC */ forward_sccp_to_msc(bsc, msg, &fd_closed); return fd_closed ? -EBADF : 0; -- To view, visit https://gerrit.osmocom.org/10936 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: I88ca95d46f4ace1da4025d12302422dbfa578354 Gerrit-Change-Number: 10936 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 Sep 13 14:48:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 14:48:05 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10936 ) Change subject: nat: Remove misleading comment ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10936/1/openbsc/src/osmo-bsc_nat/bsc_nat.c File openbsc/src/osmo-bsc_nat/bsc_nat.c: https://gerrit.osmocom.org/#/c/10936/1/openbsc/src/osmo-bsc_nat/bsc_nat.c at 1356 PS1, Line 1356: send_pong(bsc); it's being sent here. Am I missing something? -- To view, visit https://gerrit.osmocom.org/10936 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: I88ca95d46f4ace1da4025d12302422dbfa578354 Gerrit-Change-Number: 10936 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Sep 2018 14:48:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 13 14:55:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 14:55:59 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9a7a999c2c2_4c4de8c68c2668f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 299s] No package 'libpcsclite' found [ 299s] simtrace2-remsim.o: In function `main': [ 299s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 299s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 299s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 299s] apdu_dispatch.o: In function `apdu_segment_in': [ 299s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 299s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 299s] collect2: error: ld returned 1 exit status [ 299s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 299s] make[2]: *** [simtrace2-remsim] Error 1 [ 299s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 299s] Makefile:20: recipe for target 'utils' failed [ 299s] make[1]: *** [utils] Error 2 [ 299s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 299s] dh_auto_build: make -j1 returned exit code 2 [ 299s] debian/rules:4: recipe for target 'build' failed [ 299s] make: *** [build] Error 2 [ 299s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 299s] [ 299s] armbuild04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 14:55:53 UTC 2018. [ 299s] [ 299s] ### VM INTERACTION START ### [ 302s] [ 270.804503] SysRq : Power Off [ 302s] [ 270.807379] reboot: Power down [ 302s] ### VM INTERACTION END ### [ 302s] [ 302s] armbuild04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 14:55:56 UTC 2018. [ 302s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:12:55 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:12:55 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9a7e918133a_4c4de8c68c271637@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 111s] No package 'libpcsclite' found [ 111s] simtrace2-remsim.o: In function `main': [ 111s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 111s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 111s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 111s] apdu_dispatch.o: In function `apdu_segment_in': [ 111s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 111s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 111s] collect2: error: ld returned 1 exit status [ 111s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 111s] make[2]: *** [simtrace2-remsim] Error 1 [ 111s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 111s] Makefile:20: recipe for target 'utils' failed [ 111s] make[1]: *** [utils] Error 2 [ 111s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 111s] dh_auto_build: make -j1 returned exit code 2 [ 111s] debian/rules:4: recipe for target 'build' failed [ 111s] make: *** [build] Error 2 [ 111s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 111s] [ 111s] build70 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:12:39 UTC 2018. [ 111s] [ 111s] ### VM INTERACTION START ### [ 114s] [ 102.278340] sysrq: SysRq : Power Off [ 114s] [ 102.280030] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] build70 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:12:43 UTC 2018. [ 114s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu Sep 13 15:13:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Sep 2018 15:13:36 +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_#245?= In-Reply-To: <1926533234.83.1536765006478.JavaMail.jenkins@jenkins.osmocom.org> References: <1926533234.83.1536765006478.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1594866933.101.1536851616107.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Thu Sep 13 15:16:55 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:16:55 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9a7f857f2f4_4c4de8c68c273141@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 110s] No package 'libpcsclite' found [ 110s] simtrace2-remsim.o: In function `main': [ 110s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 110s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 110s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 110s] apdu_dispatch.o: In function `apdu_segment_in': [ 110s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 110s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 110s] collect2: error: ld returned 1 exit status [ 110s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 110s] make[2]: *** [simtrace2-remsim] Error 1 [ 110s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 110s] Makefile:20: recipe for target 'utils' failed [ 110s] make[1]: *** [utils] Error 2 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] dh_auto_build: make -j1 returned exit code 2 [ 110s] debian/rules:4: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 110s] [ 110s] sheep83 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:16:41 UTC 2018. [ 110s] [ 110s] ### VM INTERACTION START ### [ 114s] [ 106.586866] sysrq: SysRq : Power Off [ 114s] [ 106.593185] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] sheep83 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:16:44 UTC 2018. [ 114s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:19:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:19:12 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9a7ffca08f1_4c4de8c68c273784@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 213s] No package 'libpcsclite' found [ 213s] simtrace2-remsim.o: In function `main': [ 213s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 213s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 213s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 213s] apdu_dispatch.o: In function `apdu_segment_in': [ 213s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 213s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 213s] collect2: error: ld returned 1 exit status [ 213s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 213s] make[2]: *** [simtrace2-remsim] Error 1 [ 213s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 213s] Makefile:20: recipe for target 'utils' failed [ 213s] make[1]: *** [utils] Error 2 [ 213s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 213s] dh_auto_build: make -j1 returned exit code 2 [ 213s] debian/rules:4: recipe for target 'build' failed [ 213s] make: *** [build] Error 2 [ 213s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 213s] [ 213s] lamb28 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:18:54 UTC 2018. [ 213s] [ 213s] ### VM INTERACTION START ### [ 217s] [ 194.218806] sysrq: SysRq : Power Off [ 217s] [ 194.229411] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] lamb28 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:18:59 UTC 2018. [ 217s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:19:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:19:12 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9a7ffd2f43c_4c4de8c68c27383@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 210s] No package 'libpcsclite' found [ 210s] simtrace2-remsim.o: In function `main': [ 210s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 210s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 210s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 210s] apdu_dispatch.o: In function `apdu_segment_in': [ 210s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 210s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 210s] collect2: error: ld returned 1 exit status [ 210s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 210s] make[2]: *** [simtrace2-remsim] Error 1 [ 210s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 210s] Makefile:20: recipe for target 'utils' failed [ 210s] make[1]: *** [utils] Error 2 [ 210s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 210s] dh_auto_build: make -j1 returned exit code 2 [ 210s] debian/rules:4: recipe for target 'build' failed [ 210s] make: *** [build] Error 2 [ 210s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 210s] [ 210s] lamb28 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:18:59 UTC 2018. [ 210s] [ 210s] ### VM INTERACTION START ### [ 213s] [ 189.719049] sysrq: SysRq : Power Off [ 213s] [ 189.736263] reboot: Power down [ 213s] ### VM INTERACTION END ### [ 213s] [ 213s] lamb28 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:19:03 UTC 2018. [ 213s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:21:29 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:21:29 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9a8091b50f2_4c4de8c68c274271@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb20 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:21:25 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 129.956439] sysrq: SysRq : Power Off [ 139s] [ 129.960821] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb20 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:21:28 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:22:21 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:22:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b9a80b1acc36_4c4de8c68c274795@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 107s] #define HAVE_STDLIB_H 1 [ 107s] #define HAVE_STRING_H 1 [ 107s] #define HAVE_MEMORY_H 1 [ 107s] #define HAVE_STRINGS_H 1 [ 107s] #define HAVE_INTTYPES_H 1 [ 107s] #define HAVE_STDINT_H 1 [ 107s] #define HAVE_UNISTD_H 1 [ 107s] #define HAVE_DLFCN_H 1 [ 107s] #define LT_OBJDIR ".libs/" [ 107s] [ 107s] configure: exit 1 [ 107s] dh_auto_configure: ./configure -[ 84.328168] serial8250: too much work for irq4 [ 107s] -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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 107s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 107s] make[1]: *** [override_dh_auto_configure] Error 255 [ 107s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 107s] debian/rules:45: recipe for target 'build' failed [ 107s] make: *** [build] Error 2 [ 107s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 107s] [ 107s] wildcard2 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:22:09 UTC 2018. [ 107s] [ 107s] ### VM INTERACTION START ### [ 109s] Powering off. [ 109s] [ 85.513711] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] wildcard2 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:22:15 UTC 2018. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:23:46 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:23:46 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9a810b2b861_4c4de8c68c275242@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 526s] No package 'libpcsclite' found [ 526s] simtrace2-remsim.o: In function `main': [ 526s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 526s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 526s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 526s] apdu_dispatch.o: In function `apdu_segment_in': [ 526s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 526s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 526s] collect2: error: ld returned 1 exit status [ 526s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 526s] make[2]: *** [simtrace2-remsim] Error 1 [ 526s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 526s] Makefile:20: recipe for target 'utils' failed [ 526s] make[1]: *** [utils] Error 2 [ 526s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 526s] dh_auto_build: make -j1 returned exit code 2 [ 526s] debian/rules:4: recipe for target 'build' failed [ 526s] make: *** [build] Error 2 [ 526s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 526s] [ 526s] lamb55 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:23:38 UTC 2018. [ 526s] [ 526s] ### VM INTERACTION START ### [ 529s] [ 510.097866] sysrq: SysRq : Power Off [ 529s] [ 510.118185] reboot: Power down [ 529s] ### VM INTERACTION END ### [ 529s] [ 529s] lamb55 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:23:42 UTC 2018. [ 529s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:30:21 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:30:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9a828f3470b_4c4de8c68c277142@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 229s] No package 'libpcsclite' found [ 229s] simtrace2-remsim.o: In function `main': [ 229s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 229s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 229s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 229s] apdu_dispatch.o: In function `apdu_segment_in': [ 229s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 229s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 229s] collect2: error: ld returned 1 exit status [ 229s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 229s] make[2]: *** [simtrace2-remsim] Error 1 [ 229s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 229s] Makefile:20: recipe for target 'utils' failed [ 229s] make[1]: *** [utils] Error 2 [ 229s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 229s] dh_auto_build: make -j1 returned exit code 2 [ 229s] debian/rules:4: recipe for target 'build' failed [ 229s] make: *** [build] Error 2 [ 229s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 229s] [ 229s] cloud115 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:29:59 UTC 2018. [ 229s] [ 229s] ### VM INTERACTION START ### [ 232s] [ 180.599056] sysrq: SysRq : Power Off [ 232s] [ 180.642425] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] cloud115 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:30:03 UTC 2018. [ 233s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:34:03 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:34:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9a838245946_4c4de8c68c277980@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 125s] #define HAVE_SYS_STAT_H 1 [ 125s] #define HAVE_STDLIB_H 1 [ 125s] #define HAVE_STRING_H 1 [ 125s] #define HAVE_MEMORY_H 1 [ 125s] #define HAVE_STRINGS_H 1 [ 125s] #define HAVE_INTTYPES_H 1 [ 125s] #define HAVE_STDINT_H 1 [ 125s] #define HAVE_UNISTD_H 1 [ 125s] #define HAVE_DLFCN_H 1 [ 125s] #define LT_OBJDIR ".libs/" [ 125s] [ 125s] configure: exit 1 [ 125s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 125s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 125s] make[1]: *** [override_dh_auto_configure] Error 255 [ 125s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 125s] debian/rules:45: recipe for target 'build' failed [ 125s] make: *** [build] Error 2 [ 125s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 125s] [ 125s] cloud117 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:33:51 UTC 2018. [ 125s] [ 125s] ### VM INTERACTION START ### [ 129s] [ 104.462561] sysrq: SysRq : Power Off [ 129s] [ 104.502560] reboot: Power down [ 130s] ### VM INTERACTION END ### [ 130s] [ 130s] cloud117 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:33:56 UTC 2018. [ 130s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:36:38 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:36:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9a8417b288e_4c4de8c68c278392@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 64s] #define HAVE_SYS_STAT_H 1 [ 64s] #define HAVE_STDLIB_H 1 [ 64s] #define HAVE_STRING_H 1 [ 64s] #define HAVE_MEMORY_H 1 [ 64s] #define HAVE_STRINGS_H 1 [ 64s] #define HAVE_INTTYPES_H 1 [ 64s] #define HAVE_STDINT_H 1 [ 64s] #define HAVE_UNISTD_H 1 [ 64s] #define HAVE_DLFCN_H 1 [ 64s] #define LT_OBJDIR ".libs/" [ 64s] [ 64s] configure: exit 1 [ 64s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 64s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 64s] make[1]: *** [override_dh_auto_configure] Error 2 [ 64s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 64s] debian/rules:45: recipe for target 'build' failed [ 64s] make: *** [build] Error 2 [ 64s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 64s] [ 64s] sheep82 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:36:19 UTC 2018. [ 64s] [ 64s] ### VM INTERACTION START ### [ 67s] [ 60.056160] sysrq: SysRq : Power Off [ 67s] [ 60.062080] reboot: Power down [ 67s] ### VM INTERACTION END ### [ 67s] [ 67s] sheep82 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:36:22 UTC 2018. [ 67s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:36:55 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:36:55 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9a84312a7d3_4c4de8c68c2784d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 192s] No package 'libpcsclite' found [ 192s] simtrace2-remsim.o: In function `main': [ 192s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 192s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 192s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 192s] apdu_dispatch.o: In function `apdu_segment_in': [ 192s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 192s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 192s] collect2: error: ld returned 1 exit status [ 192s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 192s] make[2]: *** [simtrace2-remsim] Error 1 [ 192s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 192s] Makefile:20: recipe for target 'utils' failed [ 192s] make[1]: *** [utils] Error 2 [ 192s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 192s] dh_auto_build: make -j1 returned exit code 2 [ 192s] debian/rules:4: recipe for target 'build' failed [ 192s] make: *** [build] Error 2 [ 192s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 192s] [ 192s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:36:40 UTC 2018. [ 192s] [ 192s] ### VM INTERACTION START ### [ 195s] [ 182.640718] sysrq: SysRq : Power Off [ 195s] [ 182.646091] reboot: Power down [ 195s] ### VM INTERACTION END ### [ 195s] [ 195s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 15:36:43 UTC 2018. [ 195s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:39:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:39:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b9a84aecd1d3_4c4de8c68c280141@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 96s] #define HAVE_SYS_STAT_H 1 [ 96s] #define HAVE_STDLIB_H 1 [ 96s] #define HAVE_STRING_H 1 [ 96s] #define HAVE_MEMORY_H 1 [ 96s] #define HAVE_STRINGS_H 1 [ 96s] #define HAVE_INTTYPES_H 1 [ 96s] #define HAVE_STDINT_H 1 [ 96s] #define HAVE_UNISTD_H 1 [ 96s] #define HAVE_DLFCN_H 1 [ 96s] #define LT_OBJDIR ".libs/" [ 96s] [ 96s] configure: exit 1 [ 96s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 96s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 96s] make[1]: *** [override_dh_auto_configure] Error 255 [ 96s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 96s] debian/rules:45: recipe for target 'build' failed [ 96s] make: *** [build] Error 2 [ 96s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 96s] [ 96s] lamb62 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:38:59 UTC 2018. [ 96s] [ 96s] ### VM INTERACTION START ### [ 97s] Powering off. [ 97s] [ 84.312409] reboot: Power down [ 97s] ### VM INTERACTION END ### [ 97s] [ 97s] lamb62 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:39:01 UTC 2018. [ 97s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:41:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:41:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9a85229a71a_4c4de8c68c28032e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 75s] #define HAVE_SYS_STAT_H 1 [ 75s] #define HAVE_STDLIB_H 1 [ 75s] #define HAVE_STRING_H 1 [ 75s] #define HAVE_MEMORY_H 1 [ 75s] #define HAVE_STRINGS_H 1 [ 75s] #define HAVE_INTTYPES_H 1 [ 75s] #define HAVE_STDINT_H 1 [ 75s] #define HAVE_UNISTD_H 1 [ 75s] #define HAVE_DLFCN_H 1 [ 75s] #define LT_OBJDIR ".libs/" [ 75s] [ 75s] configure: exit 1 [ 75s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 75s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 75s] make[1]: *** [override_dh_auto_configure] Error 2 [ 75s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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 [ 75s] [ 75s] lamb15 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:41:07 UTC 2018. [ 75s] [ 75s] ### VM INTERACTION START ### [ 78s] [ 66.897077] sysrq: SysRq : Power Off [ 78s] [ 66.908940] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb15 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:41:10 UTC 2018. [ 78s] -- 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 Sep 13 15:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 15:43:10 +0000 Subject: Change in openbsc[master]: nat: return -EBADF in read wqueue cb on fd closed Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10937 Change subject: nat: return -EBADF in read wqueue cb on fd closed ...................................................................... nat: return -EBADF in read wqueue cb on fd closed bsc_msc_lost will close the current fd (without freeing it), so let's skip possible writes to an already closed fd bsc_msc_lost will close the current fd (without freeing it), so let's skip possible writes to an already closed fd.. Change-Id: I55c1a88f6524e897c70abf8ba18f1bb2b1f650aa --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/37/10937/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 8cc0f2d..c8a9e74 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -864,7 +864,7 @@ msc_con->name, ret); bsc_msc_lost(msc_con); - return -1; + return -EBADF; } LOGP(DNAT, LOGL_DEBUG, -- To view, visit https://gerrit.osmocom.org/10937 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: I55c1a88f6524e897c70abf8ba18f1bb2b1f650aa Gerrit-Change-Number: 10937 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 13 15:43:46 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:43:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9a85b9f29dc_4c4de8c68c281330@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 136s] #define HAVE_SYS_STAT_H 1 [ 136s] #define HAVE_STDLIB_H 1 [ 136s] #define HAVE_STRING_H 1 [ 136s] #define HAVE_MEMORY_H 1 [ 136s] #define HAVE_STRINGS_H 1 [ 136s] #define HAVE_INTTYPES_H 1 [ 136s] #define HAVE_STDINT_H 1 [ 136s] #define HAVE_UNISTD_H 1 [ 136s] #define HAVE_DLFCN_H 1 [ 136s] #define LT_OBJDIR ".libs/" [ 136s] [ 136s] configure: exit 1 [ 136s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 136s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 136s] make[1]: *** [override_dh_auto_configure] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] debian/rules:45: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] cloud105 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:43:39 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 98.499591] sysrq: SysRq : Power Off [ 139s] [ 98.543224] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 141s] [ 141s] cloud105 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:43:45 UTC 2018. [ 141s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:45:29 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:45:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9a86317c505_4c4de8c68c281773@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 152s] #define HAVE_SYS_STAT_H 1 [ 152s] #define HAVE_STDLIB_H 1 [ 152s] #define HAVE_STRING_H 1 [ 152s] #define HAVE_MEMORY_H 1 [ 152s] #define HAVE_STRINGS_H 1 [ 152s] #define HAVE_INTTYPES_H 1 [ 152s] #define HAVE_STDINT_H 1 [ 152s] #define HAVE_UNISTD_H 1 [ 152s] #define HAVE_DLFCN_H 1 [ 152s] #define LT_OBJDIR ".libs/" [ 152s] [ 152s] configure: exit 1 [ 152s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 152s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 152s] make[1]: *** [override_dh_auto_configure] Error 2 [ 152s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 152s] debian/rules:45: recipe for target 'build' failed [ 152s] make: *** [build] Error 2 [ 152s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 152s] [ 152s] cloud119 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:45:08 UTC 2018. [ 152s] [ 152s] ### VM INTERACTION START ### [ 155s] [ 115.811625] sysrq: SysRq : Power Off [ 155s] [ 115.828436] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] cloud119 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:45:13 UTC 2018. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:46:03 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:46:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9a8651dda5f_4c4de8c68c28193e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 91s] #define HAVE_SYS_STAT_H 1 [ 91s] #define HAVE_STDLIB_H 1 [ 91s] #define HAVE_STRING_H 1 [ 91s] #define HAVE_MEMORY_H 1 [ 91s] #define HAVE_STRINGS_H 1 [ 91s] #define HAVE_INTTYPES_H 1 [ 91s] #define HAVE_STDINT_H 1 [ 91s] #define HAVE_UNISTD_H 1 [ 91s] #define HAVE_DLFCN_H 1 [ 91s] #define LT_OBJDIR ".libs/" [ 91s] [ 91s] configure: exit 1 [ 91s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 91s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 91s] make[1]: *** [override_dh_auto_configure] Error 255 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 91s] debian/rules:45: recipe for target 'build' failed [ 91s] make: *** [build] Error 2 [ 91s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 91s] [ 91s] lamb51 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:45:50 UTC 2018. [ 91s] [ 91s] ### VM INTERACTION START ### [ 94s] [ 82.302037] sysrq: SysRq : Power Off [ 94s] [ 82.307159] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] lamb51 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:45:54 UTC 2018. [ 94s] -- 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 Sep 13 15:46:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 15:46:55 +0000 Subject: Change in libosmocore[master]: jenkins: add --enable-external-tests In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10890 ) Change subject: jenkins: add --enable-external-tests ...................................................................... jenkins: add --enable-external-tests Run the new logging_vty_test.vty VTY transcript test in our CI. Change-Id: Ic4ec1f6c131da50b3956f16f0b49375f387196b3 --- M contrib/jenkins_amd64.sh M contrib/jenkins_arm.sh 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh index c3af378..cd7b666 100755 --- a/contrib/jenkins_amd64.sh +++ b/contrib/jenkins_amd64.sh @@ -15,7 +15,8 @@ prep_build "$src_dir" "$build_dir" - "$src_dir"/configure --disable-silent-rules --enable-static $ENABLE_SANITIZE --enable-werror + "$src_dir"/configure --disable-silent-rules --enable-static $ENABLE_SANITIZE --enable-werror \ + --enable-external-tests run_make } diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh index 1d72f2f..e3a6cd1 100755 --- a/contrib/jenkins_arm.sh +++ b/contrib/jenkins_arm.sh @@ -18,6 +18,7 @@ --enable-embedded \ --disable-doxygen \ --disable-shared \ + --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs $WERROR_FLAGS" $MAKE $PARALLEL_MAKE -- To view, visit https://gerrit.osmocom.org/10890 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: Ic4ec1f6c131da50b3956f16f0b49375f387196b3 Gerrit-Change-Number: 10890 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 Thu Sep 13 15:46:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 15:46:56 +0000 Subject: Change in libosmocore[master]: logging vty: rewrite 'logging level' vty cmd generation In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10884 ) Change subject: logging vty: rewrite 'logging level' vty cmd generation ...................................................................... logging vty: rewrite 'logging level' vty cmd generation Completely drop the implementations of log_vty_command_{str,description}(). These functions have been public API once, marked as deprecated since c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7 (March 2017). I considered to keep them, or reduce them to useless stubs, but it is quite silly, really. These functions are completely and utterly useless outside of libosmocore. Any program linking these deserves to fail. Re-implement vty logging level command gen, in logging_vty.c. logging.c is simply the wrong place for that. Introduce logging_internal.h to share logging definitions to logging_vty.c without publishing as API. Introduce static gen_logging_level_cmd_strs() to compose a list of category arguments with their descriptions for VTY commands. Use osmo_talloc_asprintf() instead of the previous error prone and chaotic strlen() counting method. Do not dynamically generate log level arguments, just keep static strings. We are super unlikely to ever change the log levels we have. No changes in logging_vty_test.vty: proves that there is no functional change. All of this, besides introducing basic sanity, is cosmetic preparation to be able to re-use the generic command generation code for arbitrary commands with category or level args (for deprecated and new keywords). Rationale: I want to hide 'all' and 'everything' from the VTY command documentation, by means of deprecating. I first tried to simply define a deprecated 'logging level CAT everything' command: logging level (all|rsl|rr|...) (debug|info|notice|error|fatal) logging level CAT everything # <- deprecated and hidden But unfortunately, command matching doesn't work as intended when the CAT argument reflects a valid category; I want it to invoke the deprecated function as soon as the 'everything' keyword follows, but it stays stuck to the "valid" command when the category argument matches an explicit keyword in that list, and will throw an error on the following 'everything' keyword. I.e.: logging level rsl everything % Unknown command # <-- leads to config file parse error logging level unknown_string everything % Ignoring deprecated 'everything' # <-- works only for invalid categories So I need to define 'everything' separately, again with a list of each valid category instead of a generic CAT arg. Change-Id: I3b083f27e3d751ccec258880ae7676e9af959a63 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/core/logging_internal.h M src/logging.c M src/vty/logging_vty.c 5 files changed, 82 insertions(+), 172 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index ef8ec65..19695d1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -152,7 +152,10 @@ endif noinst_HEADERS = \ - osmocom/gsm/kasumi.h osmocom/gsm/gea.h + osmocom/gsm/kasumi.h \ + osmocom/gsm/gea.h \ + osmocom/core/logging_internal.h \ + $(NULL) osmocom/core/bit%gen.h: osmocom/core/bitXXgen.h.tpl $(AM_V_GEN)$(MKDIR_P) $(dir $@) diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index c60143d..295e5a8 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -374,10 +374,6 @@ void log_add_target(struct log_target *target); void log_del_target(struct log_target *target); -/* Generate command string for VTY use */ -const char *log_vty_command_string() OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; -const char *log_vty_command_description() OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; - struct log_target *log_target_find(int type, const char *fname); extern struct llist_head osmo_log_target_list; diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h new file mode 100644 index 0000000..55b1bbd --- /dev/null +++ b/include/osmocom/core/logging_internal.h @@ -0,0 +1,14 @@ +#pragma once + +/*! \defgroup logging_internal Osmocom logging internals + * @{ + * \file logging_internal.h */ + +#include + +extern void *tall_log_ctx; +extern const struct log_info *osmo_log_info; + +void assert_loginfo(const char *src); + +/*! @} */ diff --git a/src/logging.c b/src/logging.c index de0f2b0..7c2d61f 100644 --- a/src/logging.c +++ b/src/logging.c @@ -35,7 +35,6 @@ #include #include #include -#include #ifdef HAVE_STRINGS_H #include @@ -61,12 +60,10 @@ struct log_info *osmo_log_info; static struct log_context log_context; -static void *tall_log_ctx = NULL; +void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); -#define LOGLEVEL_DEFS 6 /* Number of loglevels.*/ - -static const struct value_string loglevel_strs[LOGLEVEL_DEFS+1] = { +static const struct value_string loglevel_strs[] = { { 0, "EVERYTHING" }, { LOGL_DEBUG, "DEBUG" }, { LOGL_INFO, "INFO" }, @@ -175,19 +172,7 @@ }, }; -/*! descriptive string for each log level */ -/* You have to keep this in sync with the structure loglevel_strs. */ -static const char *loglevel_descriptions[LOGLEVEL_DEFS+1] = { - "Don't use. It doesn't log anything", - "Log debug messages and higher levels", - "Log informational messages and higher levels", - "Log noticeable messages and higher levels", - "Log error messages and higher levels", - "Log only fatal messages", - NULL, -}; - -static void assert_loginfo(const char *src) +void assert_loginfo(const char *src) { if (!osmo_log_info) { fprintf(stderr, "ERROR: osmo_log_info == NULL! " @@ -963,149 +948,6 @@ return rc; } -/*! Generates the logging command string for VTY - * \param[in] unused_info Deprecated parameter, no longer used! - * \returns vty command string for use by VTY command node - */ -const char *log_vty_command_string() -{ - struct log_info *info = osmo_log_info; - int len = 0, offset = 0, ret, i, rem; - int size = strlen("logging level (all|) ()") + 1; - char *str; - - assert_loginfo(__func__); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name == NULL) - continue; - size += strlen(info->cat[i].name) + 1; - } - - for (i = 0; i < LOGLEVEL_DEFS; i++) - size += strlen(loglevel_strs[i].str) + 1; - - rem = size; - str = talloc_zero_size(tall_log_ctx, size); - if (!str) - return NULL; - - ret = snprintf(str + offset, rem, "logging level (all|"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name) { - int j, name_len = strlen(info->cat[i].name)+1; - char name[name_len]; - - for (j = 0; j < name_len; j++) - name[j] = tolower((unsigned char)info->cat[i].name[j]); - - name[name_len-1] = '\0'; - ret = snprintf(str + offset, rem, "%s|", name+1); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } - } - offset--; /* to remove the trailing | */ - rem++; - - ret = snprintf(str + offset, rem, ") ("); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - for (i = 0; i < LOGLEVEL_DEFS; i++) { - int j, loglevel_str_len = strlen(loglevel_strs[i].str)+1; - char loglevel_str[loglevel_str_len]; - - for (j = 0; j < loglevel_str_len; j++) - loglevel_str[j] = tolower((unsigned char)loglevel_strs[i].str[j]); - - loglevel_str[loglevel_str_len-1] = '\0'; - ret = snprintf(str + offset, rem, "%s|", loglevel_str); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } - offset--; /* to remove the trailing | */ - rem++; - - ret = snprintf(str + offset, rem, ")"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); -err: - str[size-1] = '\0'; - return str; -} - -/*! Generates the logging command description for VTY - * \param[in] unused_info Deprecated parameter, no longer used! - * \returns logging command description for use by VTY command node - */ -const char *log_vty_command_description() -{ - struct log_info *info = osmo_log_info; - char *str; - int i, ret, len = 0, offset = 0, rem; - unsigned int size = - strlen(LOGGING_STR - "Set the log level for a specified category\n") + 1; - - assert_loginfo(__func__); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name == NULL) - continue; - size += strlen(info->cat[i].description) + 1; - } - - for (i = 0; i < LOGLEVEL_DEFS; i++) - size += strlen(loglevel_descriptions[i]) + 1; - - size += strlen("Global setting for all subsystems") + 1; - rem = size; - str = talloc_zero_size(tall_log_ctx, size); - if (!str) - return NULL; - - ret = snprintf(str + offset, rem, LOGGING_STR - "Set the log level for a specified category\n"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - ret = snprintf(str + offset, rem, - "Global setting for all subsystems\n"); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - - for (i = 0; i < info->num_cat; i++) { - if (info->cat[i].name == NULL) - continue; - ret = snprintf(str + offset, rem, "%s\n", - info->cat[i].description); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } - for (i = 0; i < LOGLEVEL_DEFS; i++) { - ret = snprintf(str + offset, rem, "%s\n", - loglevel_descriptions[i]); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - } -err: - str[size-1] = '\0'; - return str; -} - /*! Initialize the Osmocom logging core * \param[in] inf Information regarding logging categories * \param[in] ctx \ref talloc context for logging allocations diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 7d97bb1..2b001bc 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,19 @@ #include #define LOG_STR "Configure logging sub-system\n" +#define LEVEL_STR "Set the log level for a specified category\n" + +#define CATEGORY_ALL_STR "Global setting for all subsystems\n" + +#define LOG_LEVEL_ARGS "debug|info|notice|error|fatal" +#define LOG_LEVEL_STRS \ + "Log debug messages and higher levels\n" \ + "Log informational messages and higher levels\n" \ + "Log noticeable messages and higher levels\n" \ + "Log error messages and higher levels\n" \ + "Log only fatal messages\n" + +#define EVERYTHING_STR "Don't use. It doesn't log anything\n" /*! \file logging_vty.c * Configuration of logging from VTY @@ -58,8 +72,6 @@ * */ -extern const struct log_info *osmo_log_info; - static void _vty_output(struct log_target *tgt, unsigned int level, const char *line) { @@ -268,6 +280,47 @@ return CMD_SUCCESS; } +static void add_category_strings(char **cmd_str_p, char **doc_str_p, + const struct log_info *categories) +{ + int i; + for (i = 0; i < categories->num_cat; i++) { + if (categories->cat[i].name == NULL) + continue; + /* skip the leading 'D' in each category name, hence '+ 1' */ + osmo_talloc_asprintf(tall_log_ctx, *cmd_str_p, "%s%s", + i ? "|" : "", + osmo_str_tolower(categories->cat[i].name + 1)); + osmo_talloc_asprintf(tall_log_ctx, *doc_str_p, "%s\n", + categories->cat[i].description); + } +} + +static void gen_logging_level_cmd_strs(struct cmd_element *cmd, + const char *level_args, const char *level_strs) +{ + char *cmd_str = NULL; + char *doc_str = NULL; + + assert_loginfo(__func__); + + OSMO_ASSERT(cmd->string == NULL); + OSMO_ASSERT(cmd->doc == NULL); + + osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logging level (all|"); + osmo_talloc_asprintf(tall_log_ctx, doc_str, + LOGGING_STR + LEVEL_STR + CATEGORY_ALL_STR); + add_category_strings(&cmd_str, &doc_str, osmo_log_info); + osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", level_args); + osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", level_strs); + + cmd->string = cmd_str; + cmd->doc = doc_str; +} + +/* logging level (all|) (everything|debug|...|fatal) */ DEFUN(logging_level, logging_level_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -847,7 +900,7 @@ name); printf("%s\n", cmd->string); cmd->func = log_deprecated_func; - cmd->doc = "Set the log level for a specified category\n" + cmd->doc = LEVEL_STR "Deprecated Category\n"; cmd->attr = CMD_ATTR_DEPRECATED; @@ -871,9 +924,11 @@ install_element_ve(&logging_set_category_mask_cmd); install_element_ve(&logging_set_category_mask_old_cmd); - /* Logging level strings are generated dynamically. */ - logging_level_cmd.string = log_vty_command_string(); - logging_level_cmd.doc = log_vty_command_description(); + /* logging level (all|) (everything|debug|...|fatal) */ + gen_logging_level_cmd_strs(&logging_level_cmd, + "(everything|" LOG_LEVEL_ARGS ")", + EVERYTHING_STR LOG_LEVEL_STRS); + install_element_ve(&logging_level_cmd); install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); -- To view, visit https://gerrit.osmocom.org/10884 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: I3b083f27e3d751ccec258880ae7676e9af959a63 Gerrit-Change-Number: 10884 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 Thu Sep 13 15:46:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 15:46:56 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate the 'everything' keyword In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10885 ) Change subject: logging vty: deprecate the 'everything' keyword ...................................................................... logging vty: deprecate the 'everything' keyword The 'logging level all everything' has not had an effect for some time now. The plan is to bring back its old functionality, but to keep it deprecated and rather define a less confusing name. * Deprecate 'everything'. * Do not write 'everything' during 'write file' or 'show running-config', which we curiously still do until now. BTW, the reason why we need to compose a complete list of categories for the deprecated 'everything' command is explained in detail in the commit log for I3b083f27e3d751ccec258880ae7676e9af959a63 Change-Id: Ib75fedb0572570a61bb34ee729a2af86cf5f16da --- M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 3 files changed, 35 insertions(+), 30 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/logging.c b/src/logging.c index 7c2d61f..67470a5 100644 --- a/src/logging.c +++ b/src/logging.c @@ -64,7 +64,6 @@ LLIST_HEAD(osmo_log_target_list); static const struct value_string loglevel_strs[] = { - { 0, "EVERYTHING" }, { LOGL_DEBUG, "DEBUG" }, { LOGL_INFO, "INFO" }, { LOGL_NOTICE, "NOTICE" }, diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 2b001bc..6758dd2 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -320,7 +320,7 @@ cmd->doc = doc_str; } -/* logging level (all|) (everything|debug|...|fatal) */ +/* logging level (all|) (debug|...|fatal) */ DEFUN(logging_level, logging_level_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -338,11 +338,6 @@ return CMD_WARNING; } - if (strcmp(argv[1], "everything") == 0) { /* FIXME: remove this check once 'everything' is phased out */ - vty_out(vty, "%% Ignoring deprecated logging level %s%s", argv[1], VTY_NEWLINE); - return CMD_SUCCESS; - } - /* Check for special case where we want to set global log level */ if (!strcmp(argv[0], "all")) { log_set_log_level(tgt, level); @@ -360,6 +355,15 @@ return CMD_SUCCESS; } +/* logging level (all|) everything */ +DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd, + NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ + NULL) /* same thing for helpstr. */ +{ + vty_out(vty, "%% Ignoring deprecated logging level 'everything' keyword%s", VTY_NEWLINE); + return CMD_SUCCESS; +} + DEFUN(logging_set_category_mask, logging_set_category_mask_cmd, "logging set-log-mask MASK", @@ -858,8 +862,9 @@ VTY_NEWLINE); /* stupid old osmo logging API uses uppercase strings... */ - vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), - VTY_NEWLINE); + if (tgt->loglevel) + vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), + VTY_NEWLINE); for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; @@ -896,7 +901,7 @@ { struct cmd_element *cmd = talloc_zero(ctx, struct cmd_element); OSMO_ASSERT(cmd); - cmd->string = talloc_asprintf(cmd, "logging level %s (everything|debug|info|notice|error|fatal)", + cmd->string = talloc_asprintf(cmd, "logging level %s (debug|info|notice|error|fatal)", name); printf("%s\n", cmd->string); cmd->func = log_deprecated_func; @@ -924,12 +929,16 @@ install_element_ve(&logging_set_category_mask_cmd); install_element_ve(&logging_set_category_mask_old_cmd); - /* logging level (all|) (everything|debug|...|fatal) */ + /* logging level (all|) (debug|...|fatal) */ gen_logging_level_cmd_strs(&logging_level_cmd, - "(everything|" LOG_LEVEL_ARGS ")", - EVERYTHING_STR LOG_LEVEL_STRS); + "(" LOG_LEVEL_ARGS ")", + LOG_LEVEL_STRS); + /* logging level (all|) everything */ + gen_logging_level_cmd_strs(&deprecated_logging_level_everything_cmd, + "everything", EVERYTHING_STR); install_element_ve(&logging_level_cmd); + install_element_ve(&deprecated_logging_level_everything_cmd); install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); @@ -943,6 +952,7 @@ install_element(CFG_LOG_NODE, &logging_prnt_level_cmd); install_element(CFG_LOG_NODE, &logging_prnt_file_cmd); install_element(CFG_LOG_NODE, &logging_level_cmd); + install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd); install_element(CONFIG_NODE, &cfg_log_stderr_cmd); install_element(CONFIG_NODE, &cfg_no_log_stderr_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index c57b70f..a2c1e74 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -1,11 +1,9 @@ logging_vty_test> enable -logging_vty_test# ! Note that 'logging level all everything' is still printed! logging_vty_test# show running-config ... log stderr -... - logging level all everything +... !logging level all logging level aa debug logging level bb info logging level ccc notice @@ -39,7 +37,7 @@ logging print level (0|1) logging print file (0|1|basename) [last] logging set-log-mask MASK - logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (everything|debug|info|notice|error|fatal) + logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) show logging vty ... !logging @@ -64,20 +62,18 @@ ... logging_vty_test# logging level aa ? - everything Don't use. It doesn't log anything - debug Log debug messages and higher levels - info Log informational messages and higher levels - notice Log noticeable messages and higher levels - error Log error messages and higher levels - fatal Log only fatal messages + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages logging_vty_test# logging level all ? - everything Don't use. It doesn't log anything - debug Log debug messages and higher levels - info Log informational messages and higher levels - notice Log noticeable messages and higher levels - error Log error messages and higher levels - fatal Log only fatal messages + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages logging_vty_test# log-sweep @@ -181,7 +177,7 @@ logging_vty_test# ! Old 'logging level all everything' has no effect logging_vty_test# logging level all everything -% Ignoring deprecated logging level everything +% Ignoring deprecated logging level 'everything' keyword logging_vty_test# log-sweep eee DEEE NOTICE Log message for DEEE on level LOGL_NOTICE DEEE ERROR Log message for DEEE on level LOGL_ERROR -- To view, visit https://gerrit.osmocom.org/10885 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: Ib75fedb0572570a61bb34ee729a2af86cf5f16da Gerrit-Change-Number: 10885 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 Thu Sep 13 15:46:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 15:46:57 +0000 Subject: Change in libosmocore[master]: logging vty: write: check logging levels validity In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10887 ) Change subject: logging vty: write: check logging levels validity ...................................................................... logging vty: write: check logging levels validity Change-Id: If683b1272ad2d5b402b91c52c496aa7975bc6315 --- M include/osmocom/core/logging_internal.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 25 insertions(+), 8 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 55b1bbd..a510f83 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -8,6 +8,7 @@ extern void *tall_log_ctx; extern const struct log_info *osmo_log_info; +extern const struct value_string loglevel_strs[]; void assert_loginfo(const char *src); diff --git a/src/logging.c b/src/logging.c index 67470a5..e7cc472 100644 --- a/src/logging.c +++ b/src/logging.c @@ -63,7 +63,7 @@ void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); -static const struct value_string loglevel_strs[] = { +const struct value_string loglevel_strs[] = { { LOGL_DEBUG, "DEBUG" }, { LOGL_INFO, "INFO" }, { LOGL_NOTICE, "NOTICE" }, diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 6758dd2..c8e8520 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -861,21 +861,37 @@ get_value_string(logging_print_file_args, tgt->print_filename2), VTY_NEWLINE); - /* stupid old osmo logging API uses uppercase strings... */ - if (tgt->loglevel) - vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)), - VTY_NEWLINE); + if (tgt->loglevel) { + const char *level_str = get_value_string_or_null(loglevel_strs, tgt->loglevel); + level_str = osmo_str_tolower(level_str); + if (!level_str) + vty_out(vty, "%% Invalid log level %u for 'all'%s", tgt->loglevel, VTY_NEWLINE); + else + vty_out(vty, " logging level all %s%s", level_str, VTY_NEWLINE); + } for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; + const char *cat_name; + const char *level_str; /* skip empty entries in the array */ if (!osmo_log_info->cat[i].name) continue; - /* stupid old osmo logging API uses uppercase strings... */ - vty_out(vty, " logging level %s", osmo_str_tolower(osmo_log_info->cat[i].name+1)); - vty_out(vty, " %s%s", osmo_str_tolower(log_level_str(cat->loglevel)), VTY_NEWLINE); + /* Note: cat_name references the static buffer returned by osmo_str_tolower(), will + * become invalid after next osmo_str_tolower() invocation. */ + cat_name = osmo_str_tolower(osmo_log_info->cat[i].name+1); + + level_str = get_value_string_or_null(loglevel_strs, cat->loglevel); + if (!level_str) { + vty_out(vty, "%% Invalid log level %u for %s%s", cat->loglevel, cat_name, + VTY_NEWLINE); + continue; + } + + vty_out(vty, " logging level %s", cat_name); + vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE); } return 1; -- To view, visit https://gerrit.osmocom.org/10887 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: If683b1272ad2d5b402b91c52c496aa7975bc6315 Gerrit-Change-Number: 10887 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 Thu Sep 13 15:46:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 15:46:57 +0000 Subject: Change in libosmocore[master]: logging vty: deprecate 'all', introduce 'force-all' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10888 ) Change subject: logging vty: deprecate 'all', introduce 'force-all' ...................................................................... logging vty: deprecate 'all', introduce 'force-all' Add 'logging level force-all ' and 'no logging level force-all' as new names for 'logging level all ' and 'logging level all everything'. Resurrect the functionality of 'logging level all everything' -- even if it is still deprecated because the name is confusing, it is now just an alias for 'no logging level force-all'. Show in logging_vty_test.vty that we can now again lift the global logging clamp, both with the new commands as well as with the deprecated ones. Also show that 'force-all' is written back properly, if set. Change-Id: I36f17c131cc70ce5a1aef62fd9693097de230cd4 --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 190 insertions(+), 33 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/logging_vty.c b/src/vty/logging_vty.c index c8e8520..3b1d8c6 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -43,9 +43,15 @@ #define LOG_STR "Configure logging sub-system\n" #define LEVEL_STR "Set the log level for a specified category\n" -#define CATEGORY_ALL_STR "Global setting for all subsystems\n" +#define CATEGORY_ALL_STR "Deprecated alias for 'force-all'\n" +#define FORCE_ALL_STR \ + "Globally force all logging categories to a specific level. This is released by the" \ + " 'no logging level force-all' command. Note: any 'logging level '" \ + " commands will have no visible effect after this, until the forced level is released.\n" +#define NO_FORCE_ALL_STR \ + "Release any globally forced log level set with 'logging level force-all '\n" -#define LOG_LEVEL_ARGS "debug|info|notice|error|fatal" +#define LOG_LEVEL_ARGS "(debug|info|notice|error|fatal)" #define LOG_LEVEL_STRS \ "Log debug messages and higher levels\n" \ "Log informational messages and higher levels\n" \ @@ -53,7 +59,7 @@ "Log error messages and higher levels\n" \ "Log only fatal messages\n" -#define EVERYTHING_STR "Don't use. It doesn't log anything\n" +#define EVERYTHING_STR "Deprecated alias for 'no logging level force-all'\n" /*! \file logging_vty.c * Configuration of logging from VTY @@ -307,11 +313,10 @@ OSMO_ASSERT(cmd->string == NULL); OSMO_ASSERT(cmd->doc == NULL); - osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logging level (all|"); + osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logging level ("); osmo_talloc_asprintf(tall_log_ctx, doc_str, LOGGING_STR - LEVEL_STR - CATEGORY_ALL_STR); + LEVEL_STR); add_category_strings(&cmd_str, &doc_str, osmo_log_info); osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", level_args); osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", level_strs); @@ -320,7 +325,7 @@ cmd->doc = doc_str; } -/* logging level (all|) (debug|...|fatal) */ +/* logging level () (debug|...|fatal) */ DEFUN(logging_level, logging_level_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -338,12 +343,6 @@ return CMD_WARNING; } - /* Check for special case where we want to set global log level */ - if (!strcmp(argv[0], "all")) { - log_set_log_level(tgt, level); - return CMD_SUCCESS; - } - if (category < 0) { vty_out(vty, "Invalid category `%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -355,7 +354,7 @@ return CMD_SUCCESS; } -/* logging level (all|) everything */ +/* logging level () everything */ DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ NULL) /* same thing for helpstr. */ @@ -364,6 +363,35 @@ return CMD_SUCCESS; } +DEFUN(logging_level_force_all, logging_level_force_all_cmd, + "logging level force-all " LOG_LEVEL_ARGS, + LOGGING_STR LEVEL_STR FORCE_ALL_STR LOG_LEVEL_STRS) +{ + struct log_target *tgt = osmo_log_vty2tgt(vty); + int level = log_parse_level(argv[0]); + log_set_log_level(tgt, level); + return CMD_SUCCESS; +} + +DEFUN(no_logging_level_force_all, no_logging_level_force_all_cmd, + "no logging level force-all", + NO_STR LOGGING_STR LEVEL_STR NO_FORCE_ALL_STR) +{ + struct log_target *tgt = osmo_log_vty2tgt(vty); + log_set_log_level(tgt, 0); + return CMD_SUCCESS; +} + +/* 'logging level all (debug|...|fatal)' */ +ALIAS_DEPRECATED(logging_level_force_all, deprecated_logging_level_all_cmd, + "logging level all " LOG_LEVEL_ARGS, + LOGGING_STR LEVEL_STR CATEGORY_ALL_STR LOG_LEVEL_STRS); + +/* 'logging level all everything' */ +ALIAS_DEPRECATED(no_logging_level_force_all, deprecated_logging_level_all_everything_cmd, + "logging level all everything", + LOGGING_STR LEVEL_STR CATEGORY_ALL_STR EVERYTHING_STR); + DEFUN(logging_set_category_mask, logging_set_category_mask_cmd, "logging set-log-mask MASK", @@ -865,9 +893,10 @@ const char *level_str = get_value_string_or_null(loglevel_strs, tgt->loglevel); level_str = osmo_str_tolower(level_str); if (!level_str) - vty_out(vty, "%% Invalid log level %u for 'all'%s", tgt->loglevel, VTY_NEWLINE); + vty_out(vty, "%% Invalid log level %u for 'force-all'%s", + tgt->loglevel, VTY_NEWLINE); else - vty_out(vty, " logging level all %s%s", level_str, VTY_NEWLINE); + vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); } for (i = 0; i < osmo_log_info->num_cat; i++) { @@ -945,16 +974,20 @@ install_element_ve(&logging_set_category_mask_cmd); install_element_ve(&logging_set_category_mask_old_cmd); - /* logging level (all|) (debug|...|fatal) */ + /* logging level () (debug|...|fatal) */ gen_logging_level_cmd_strs(&logging_level_cmd, - "(" LOG_LEVEL_ARGS ")", + LOG_LEVEL_ARGS, LOG_LEVEL_STRS); - /* logging level (all|) everything */ + /* logging level () everything */ gen_logging_level_cmd_strs(&deprecated_logging_level_everything_cmd, "everything", EVERYTHING_STR); install_element_ve(&logging_level_cmd); + install_element_ve(&logging_level_force_all_cmd); + install_element_ve(&no_logging_level_force_all_cmd); install_element_ve(&deprecated_logging_level_everything_cmd); + install_element_ve(&deprecated_logging_level_all_cmd); + install_element_ve(&deprecated_logging_level_all_everything_cmd); install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); @@ -968,7 +1001,11 @@ install_element(CFG_LOG_NODE, &logging_prnt_level_cmd); install_element(CFG_LOG_NODE, &logging_prnt_file_cmd); install_element(CFG_LOG_NODE, &logging_level_cmd); + install_element(CFG_LOG_NODE, &logging_level_force_all_cmd); + install_element(CFG_LOG_NODE, &no_logging_level_force_all_cmd); install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd); + install_element(CFG_LOG_NODE, &deprecated_logging_level_all_cmd); + install_element(CFG_LOG_NODE, &deprecated_logging_level_all_everything_cmd); install_element(CONFIG_NODE, &cfg_log_stderr_cmd); install_element(CONFIG_NODE, &cfg_no_log_stderr_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index a2c1e74..03b0c4a 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -12,6 +12,19 @@ ... logging_vty_test# configure terminal +logging_vty_test(config)# log stderr + +logging_vty_test(config-log)# logging level force-all notice +logging_vty_test(config-log)# show running-config +... !logging level all + logging level force-all notice +... !logging level all + +logging_vty_test(config-log)# no logging level force-all +logging_vty_test(config-log)# show running-config +... !logging level force-all + +logging_vty_test(config-log)# exit logging_vty_test(config)# no log stderr logging_vty_test(config)# exit @@ -37,9 +50,10 @@ logging print level (0|1) logging print file (0|1|basename) [last] logging set-log-mask MASK - logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) - show logging vty -... !logging + logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) + logging level force-all (debug|info|notice|error|fatal) + no logging level force-all +... !^ logging logging_vty_test# logging ? enable Enables logging to this vty @@ -52,14 +66,15 @@ level Set the log level for a specified category logging_vty_test# logging level ? - all Global setting for all subsystems - aa Antropomorphic Armadillos (AA) - bb Bidirectional Breadspread (BB) - ccc Chaos Communication Congress (CCC) - dddd Dehydrated Dribbling Duck Dunkers (DDDD) - eee Exhaustive Entropy Extraction (EEE) - lglobal Library-internal global log family -... +... ! all + aa Antropomorphic Armadillos (AA) + bb Bidirectional Breadspread (BB) + ccc Chaos Communication Congress (CCC) + dddd Dehydrated Dribbling Duck Dunkers (DDDD) + eee Exhaustive Entropy Extraction (EEE) + lglobal Library-internal global log family +... ! all + force-all Globally force all logging categories to a specific level. This is released by the 'no logging level force-all' command. Note: any 'logging level ' commands will have no visible effect after this, until the forced level is released. logging_vty_test# logging level aa ? debug Log debug messages and higher levels @@ -69,12 +84,18 @@ fatal Log only fatal messages logging_vty_test# logging level all ? +% There is no matched command. + +logging_vty_test# logging level force-all ? debug Log debug messages and higher levels info Log informational messages and higher levels notice Log noticeable messages and higher levels error Log error messages and higher levels fatal Log only fatal messages +logging_vty_test# no logging level ? + force-all Release any globally forced log level set with 'logging level force-all ' + logging_vty_test# log-sweep DAA DEBUG Log message for DAA on level LOGL_DEBUG @@ -93,6 +114,7 @@ DDDDD FATAL Log message for DDDDD on level LOGL_FATAL DEEE FATAL Log message for DEEE on level LOGL_FATAL +logging_vty_test# ! The deprecated 'logging level all' still does what it did logging_vty_test# logging level all fatal logging_vty_test# log-sweep DAA FATAL Log message for DAA on level LOGL_FATAL @@ -175,12 +197,110 @@ DEEE ERROR Log message for DEEE on level LOGL_ERROR DEEE FATAL Log message for DEEE on level LOGL_FATAL -logging_vty_test# ! Old 'logging level all everything' has no effect +logging_vty_test# ! Deprecated 'logging level all everything' lifts the globally forced level logging_vty_test# logging level all everything -% Ignoring deprecated logging level 'everything' keyword +logging_vty_test# log-sweep eee +DEEE FATAL Log message for DEEE on level LOGL_FATAL + + +logging_vty_test# ! Now do the same dance with the new 'logging level force-all' commands +logging_vty_test# logging level force-all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level force-all error +logging_vty_test# log-sweep +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level force-all notice +logging_vty_test# log-sweep +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level force-all debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB DEBUG Log message for DBB on level LOGL_DEBUG +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC DEBUG Log message for DCCC on level LOGL_DEBUG +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE DEBUG Log message for DEEE on level LOGL_DEBUG +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! 'force-all' overrides everything, be it stronger or weaker +logging_vty_test# logging level force-all notice +logging_vty_test# logging level eee debug logging_vty_test# log-sweep eee DEEE NOTICE Log message for DEEE on level LOGL_NOTICE DEEE ERROR Log message for DEEE on level LOGL_ERROR DEEE FATAL Log message for DEEE on level LOGL_FATAL -logging_vty_test# ! There is currently no way to remove the 'logging level all' level! +logging_vty_test# logging level force-all notice +logging_vty_test# logging level eee fatal +logging_vty_test# log-sweep eee +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# ! lift the globally forced level +logging_vty_test# no logging level force-all +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL -- To view, visit https://gerrit.osmocom.org/10888 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: I36f17c131cc70ce5a1aef62fd9693097de230cd4 Gerrit-Change-Number: 10888 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 13 15:47:29 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:47:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9a86ab853a4_4c4de8c68c282489@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 154s] #define HAVE_SYS_STAT_H 1 [ 154s] #define HAVE_STDLIB_H 1 [ 154s] #define HAVE_STRING_H 1 [ 154s] #define HAVE_MEMORY_H 1 [ 154s] #define HAVE_STRINGS_H 1 [ 154s] #define HAVE_INTTYPES_H 1 [ 154s] #define HAVE_STDINT_H 1 [ 154s] #define HAVE_UNISTD_H 1 [ 154s] #define HAVE_DLFCN_H 1 [ 154s] #define LT_OBJDIR ".libs/" [ 154s] [ 154s] configure: exit 1 [ 154s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 154s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 154s] make[1]: *** [override_dh_auto_configure] Error 2 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] debian/rules:45: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 154s] [ 154s] cloud104 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:47:17 UTC 2018. [ 154s] [ 154s] ### VM INTERACTION START ### [ 157s] [ 135.412494] sysrq: SysRq : Power Off [ 157s] [ 135.451252] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] cloud104 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:47:22 UTC 2018. [ 158s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 15:48:38 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:48:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9a86e67bebd_4c4de8c68c28281@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 142s] #define HAVE_SYS_STAT_H 1 [ 142s] #define HAVE_STDLIB_H 1 [ 142s] #define HAVE_STRING_H 1 [ 142s] #define HAVE_MEMORY_H 1 [ 142s] #define HAVE_STRINGS_H 1 [ 142s] #define HAVE_INTTYPES_H 1 [ 142s] #define HAVE_STDINT_H 1 [ 142s] #define HAVE_UNISTD_H 1 [ 142s] #define HAVE_DLFCN_H 1 [ 142s] #define LT_OBJDIR ".libs/" [ 142s] [ 142s] configure: exit 1 [ 142s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 142s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 142s] make[1]: *** [override_dh_auto_configure] Error 2 [ 142s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 142s] debian/rules:45: recipe for target 'build' failed [ 142s] make: *** [build] Error 2 [ 142s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 142s] [ 142s] lamb51 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:48:27 UTC 2018. [ 142s] [ 142s] ### VM INTERACTION START ### [ 145s] [ 132.269169] sysrq: SysRq : Power Off [ 145s] [ 132.290351] reboot: Power down [ 145s] ### VM INTERACTION END ### [ 145s] [ 145s] lamb51 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:48:31 UTC 2018. [ 145s] -- 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 Sep 13 15:49:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 15:49:41 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI remote host (-i) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI remote host (-i) ...................................................................... Patch Set 2: the gsmtap host setting only has effect during program startup, the vty command doesn't actively change over to another address -- my aim was to configure ot from .cfg file to not have to change the cmdline, not to switch it in the running program ... then again, maybe it should be doing that? Or, even if it doesn't do it yet, keep that option for the future and not even start supporting arbitrary host names now? -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 15:49:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 13 15:50:03 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 15:50:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9a873fe7e80_4c4de8c68c28332a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 106s] #define HAVE_SYS_STAT_H 1 [ 106s] #define HAVE_STDLIB_H 1 [ 106s] #define HAVE_STRING_H 1 [ 106s] #define HAVE_MEMORY_H 1 [ 106s] #define HAVE_STRINGS_H 1 [ 106s] #define HAVE_INTTYPES_H 1 [ 106s] #define HAVE_STDINT_H 1 [ 106s] #define HAVE_UNISTD_H 1 [ 106s] #define HAVE_DLFCN_H 1 [ 106s] #define LT_OBJDIR ".libs/" [ 106s] [ 106s] configure: exit 1 [ 106s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 106s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 106s] make[1]: *** [override_dh_auto_configure] Error 2 [ 106s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 106s] debian/rules:45: recipe for target 'build' failed [ 106s] make: *** [build] Error 2 [ 106s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 106s] [ 106s] armbuild21 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:49:53 UTC 2018. [ 106s] [ 106s] ### VM INTERACTION START ### [ 109s] [ 96.369743] SysRq : Power Off [ 109s] [ 96.371855] reboot: Power down [ 109s] ### VM INTERACTION END ### [ 109s] [ 109s] armbuild21 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 15:49:56 UTC 2018. [ 109s] -- 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 Sep 13 15:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 15:50:39 +0000 Subject: Change in osmo-sgsn[master]: debian: Add missing dependencies to build with IU support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10938 Change subject: debian: Add missing dependencies to build with IU support ...................................................................... debian: Add missing dependencies to build with IU support Change-Id: Ic8bfef3a72d5e8ba7ecf1f4fb27f7007c5fa5f19 --- M debian/control 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/10938/1 diff --git a/debian/control b/debian/control index 46a6b67..7822561 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,10 @@ libosmo-abis-dev, libosmo-ranap-dev, libosmo-sccp-dev, - libosmo-netif-dev + libosmo-netif-dev, + libasn1c-dev (>= 0.9.28), + libosmo-sigtran-dev (>= 0.10.0), + libosmo-ranap-dev (>= 0.3.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git Vcs-Browser: https://git.osmocom.org/osmo-sgsn -- To view, visit https://gerrit.osmocom.org/10938 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: Ic8bfef3a72d5e8ba7ecf1f4fb27f7007c5fa5f19 Gerrit-Change-Number: 10938 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Sep 13 15:53:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Sep 2018 15:53:48 +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_#698?= In-Reply-To: <1492228239.99.1536849941953.JavaMail.jenkins@jenkins.osmocom.org> References: <1492228239.99.1536849941953.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <435899140.102.1536854028757.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Sep 13 15:58:10 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Sep 2018 15:58:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1254?= Message-ID: <651543344.103.1536854290437.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 149.83 KB...] KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g none OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g ? none Delete 3G authentication data milenage Use Milenage algorithm OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ? k Set Encryption Key K OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k ? K K as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d ? op Set OP key opc Set OPC key OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc ? OP_C OP or OPC as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ? [ind-bitlen] Set IND bit length OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen ? [<0-28>] IND bit length value (default: 5) OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=deafbeddedbabeacceededfadeddecaf IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' OsmoHLR# subscriber imsi 123456789023000 show 20180913155810182 DAUC <0003> db_hlr.c:456 Cannot read subscriber from db: IMSI='123456789023000': No such subscriber % No subscriber for imsi = '123456789023000' OsmoHLR# subscriber id 1 show 20180913155810182 DAUC <0003> db_hlr.c:504 Cannot read subscriber from db: ID=1: No such subscriber % No subscriber for id = '1' OsmoHLR# subscriber msisdn 423 show 20180913155810182 DAUC <0003> db_hlr.c:480 Cannot read subscriber from db: MSISDN='423': No such subscriber % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 ID: 1 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' RESULTS: FAIL: ./test_nodes.vty pass: ./test_subscriber.vty Makefile:698: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 1 make[6]: Leaving directory ' Makefile:691: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory ' Makefile:724: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory ' Makefile:550: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:402: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory ' Makefile:479: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:770: 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 admin at opensuse.org Thu Sep 13 16:06:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 16:06:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b9a8afee33c0_4c4de8c68c2855f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 152s] #define HAVE_SYS_STAT_H 1 [ 152s] #define HAVE_STDLIB_H 1 [ 152s] #define HAVE_STRING_H 1 [ 152s] #define HAVE_MEMORY_H 1 [ 152s] #define HAVE_STRINGS_H 1 [ 152s] #define HAVE_INTTYPES_H 1 [ 152s] #define HAVE_STDINT_H 1 [ 152s] #define HAVE_UNISTD_H 1 [ 152s] #define HAVE_DLFCN_H 1 [ 152s] #define LT_OBJDIR ".libs/" [ 152s] [ 152s] configure: exit 1 [ 152s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 152s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 152s] make[1]: *** [override_dh_auto_configure] Error 255 [ 152s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 152s] debian/rules:45: recipe for target 'build' failed [ 152s] make: *** [build] Error 2 [ 152s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 152s] [ 152s] cloud129 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 16:05:57 UTC 2018. [ 152s] [ 152s] ### VM INTERACTION START ### [ 154s] Powering off. [ 154s] [ 106.553244] reboot: Power down [ 155s] ### VM INTERACTION END ### [ 155s] [ 155s] cloud129 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 16:06:01 UTC 2018. [ 155s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu Sep 13 16:09:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Sep 2018 16:09:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1255?= In-Reply-To: <651543344.103.1536854290437.JavaMail.jenkins@jenkins.osmocom.org> References: <651543344.103.1536854290437.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1075190625.104.1536854982093.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 148.51 KB...] KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g none OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g ? none Delete 3G authentication data milenage Use Milenage algorithm OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ? k Set Encryption Key K OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k ? K K as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d ? op Set OP key opc Set OPC key OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc ? OP_C OP or OPC as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ? [ind-bitlen] Set IND bit length OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen ? [<0-28>] IND bit length value (default: 5) OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=deafbeddedbabeacceededfadeddecaf IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' OsmoHLR# subscriber imsi 123456789023000 show 20180913160941867 DAUC <0003> db_hlr.c:456 Cannot read subscriber from db: IMSI='123456789023000': No such subscriber % No subscriber for imsi = '123456789023000' OsmoHLR# subscriber id 1 show 20180913160941867 DAUC <0003> db_hlr.c:504 Cannot read subscriber from db: ID=1: No such subscriber % No subscriber for id = '1' OsmoHLR# subscriber msisdn 423 show 20180913160941867 DAUC <0003> db_hlr.c:480 Cannot read subscriber from db: MSISDN='423': No such subscriber % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 ID: 1 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' RESULTS: FAIL: ./test_nodes.vty pass: ./test_subscriber.vty Makefile:698: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 1 make[6]: Leaving directory ' Makefile:691: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory ' Makefile:724: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory ' Makefile:550: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:402: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory ' Makefile:479: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:770: 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 Thu Sep 13 16:17:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 16:17:01 +0000 Subject: Change in osmo-hlr[master]: fix build: adjust test_nodes.vty to logging change Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10939 Change subject: fix build: adjust test_nodes.vty to logging change ...................................................................... fix build: adjust test_nodes.vty to logging change Since libosmocore commit eb9284ba577d338f74653fcf09ebca0c397823eb Change-Id I36f17c131cc70ce5a1aef62fd9693097de230cd4 "logging vty: deprecate 'all', introduce 'force-all'" , 'logging level all' is replaced by 'force-all'. Adjust the test script to not expect 'logging level all'. While at it, remove some more expectations that aren't important. Change-Id: Ia170f8416ebb60c499d2536078f43f28b61d0554 --- M tests/test_nodes.vty 1 file changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/39/10939/1 diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 58f5c61..d2c455f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -107,23 +107,12 @@ ! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging print extended-timestamp 1 - logging print file 1 - logging level all notice +... logging level main notice logging level db notice logging level auc notice logging level ss info ... -! -line vty - no login -! -ctrl - bind 127.0.0.1 hlr gsup bind ip 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/10939 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: Ia170f8416ebb60c499d2536078f43f28b61d0554 Gerrit-Change-Number: 10939 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 16:22:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Sep 2018 16:22:22 +0000 Subject: Change in osmo-gsm-tester[master]: Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10928 ) Change subject: Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git ...................................................................... Build and use osmo-bsc_mgcp from openbsc.git instead of osmo-mgw.git In osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc, osmo-bsc_mgcp was dropped and the one from openbsc.git must be used. Change-Id: Ib1c46baf4d36ab18f8064a2234a0ba28a1e7d2c2 --- M contrib/jenkins-build-osmo-mgw.sh M contrib/jenkins-build-osmo-nitb.sh M src/osmo_gsm_tester/osmo_mgcpgw.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index 43473c6..5c1ce74 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -9,4 +9,4 @@ build_repo libosmo-netif --enable-sanitize --disable-doxygen build_repo osmo-mgw --enable-sanitize -create_bin_tgz "osmo-bsc_mgcp osmo-mgw" +create_bin_tgz "osmo-mgw" diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index ef55259..1e3ecc6 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -12,4 +12,4 @@ build_repo libosmo-sccp build_repo openbsc --enable-smpp --enable-osmo-bsc --enable-nat -create_bin_tgz osmo-nitb +create_bin_tgz "osmo-nitb osmo-bsc_mgcp" diff --git a/src/osmo_gsm_tester/osmo_mgcpgw.py b/src/osmo_gsm_tester/osmo_mgcpgw.py index 82b9149..668e4ce 100644 --- a/src/osmo_gsm_tester/osmo_mgcpgw.py +++ b/src/osmo_gsm_tester/osmo_mgcpgw.py @@ -38,7 +38,7 @@ self.log('Starting osmo-mgcpgw') self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() - inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-mgw'))) + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-nitb'))) binary = inst.child('bin', 'osmo-bsc_mgcp') if not os.path.isfile(binary): raise RuntimeError('Binary missing: %r' % binary) -- To view, visit https://gerrit.osmocom.org/10928 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: Ib1c46baf4d36ab18f8064a2234a0ba28a1e7d2c2 Gerrit-Change-Number: 10928 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 Sep 13 16:24:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 16:24:00 +0000 Subject: Change in osmo-hlr[master]: tweak example config Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10940 Change subject: tweak example config ...................................................................... tweak example config Remove 'logging level all' setting. Tweak some more logging details (to my current favorite). Add USSD example for showing the IMSI. Change-Id: I8296832704d779df5f1b20a595b568c99780e64d --- M doc/examples/osmo-hlr.cfg 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/40/10940/1 diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg index 35d942d..54993a9 100644 --- a/doc/examples/osmo-hlr.cfg +++ b/doc/examples/osmo-hlr.cfg @@ -5,9 +5,10 @@ logging filter all 1 logging color 1 logging print category 1 - logging timestamp 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 - logging level all notice logging level main notice logging level db notice logging level auc notice @@ -22,3 +23,4 @@ gsup bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn + ussd route prefix *#101# internal own-imsi -- To view, visit https://gerrit.osmocom.org/10940 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: I8296832704d779df5f1b20a595b568c99780e64d Gerrit-Change-Number: 10940 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 16:24:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 16:24:50 +0000 Subject: Change in osmo-hlr[master]: fix build: adjust test_nodes.vty to logging change In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10939 ) Change subject: fix build: adjust test_nodes.vty to logging change ...................................................................... Patch Set 1: Code-Review+2 fast track to fix master build -- To view, visit https://gerrit.osmocom.org/10939 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: Ia170f8416ebb60c499d2536078f43f28b61d0554 Gerrit-Change-Number: 10939 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 13 Sep 2018 16:24: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 Sep 13 16:24:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Sep 2018 16:24:52 +0000 Subject: Change in osmo-hlr[master]: fix build: adjust test_nodes.vty to logging change In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10939 ) Change subject: fix build: adjust test_nodes.vty to logging change ...................................................................... fix build: adjust test_nodes.vty to logging change Since libosmocore commit eb9284ba577d338f74653fcf09ebca0c397823eb Change-Id I36f17c131cc70ce5a1aef62fd9693097de230cd4 "logging vty: deprecate 'all', introduce 'force-all'" , 'logging level all' is replaced by 'force-all'. Adjust the test script to not expect 'logging level all'. While at it, remove some more expectations that aren't important. Change-Id: Ia170f8416ebb60c499d2536078f43f28b61d0554 --- M tests/test_nodes.vty 1 file changed, 1 insertion(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 58f5c61..d2c455f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -107,23 +107,12 @@ ! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging print extended-timestamp 1 - logging print file 1 - logging level all notice +... logging level main notice logging level db notice logging level auc notice logging level ss info ... -! -line vty - no login -! -ctrl - bind 127.0.0.1 hlr gsup bind ip 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/10939 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: Ia170f8416ebb60c499d2536078f43f28b61d0554 Gerrit-Change-Number: 10939 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 jenkins at lists.osmocom.org Thu Sep 13 16:30:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Sep 2018 16:30:21 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-hlr_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1256?= In-Reply-To: <1075190625.104.1536854982093.JavaMail.jenkins@jenkins.osmocom.org> References: <1075190625.104.1536854982093.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <482352647.106.1536856221565.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Sep 13 16:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 13 Sep 2018 16:34:02 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove redundant unit from freq_offset variable name In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10933 ) Change subject: apps/grgsm_trx: remove redundant unit from freq_offset variable name ...................................................................... Patch Set 1: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10933 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: I509771c3fe072069a680f66b0763ae6825f6d529 Gerrit-Change-Number: 10933 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 16:34:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 16:34:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 13 Sep 2018 16:34:36 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: remove redundant unit from freq_offset variable name In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10933 ) Change subject: apps/grgsm_trx: remove redundant unit from freq_offset variable name ...................................................................... apps/grgsm_trx: remove redundant unit from freq_offset variable name Frequency is always in Hz so there is no need to add that information in the variable name. Change-Id: I509771c3fe072069a680f66b0763ae6825f6d529 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index b53d12a..efb9c24 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -52,7 +52,7 @@ self.phy_tx_gain = argv.tx_gain self.phy_rx_antenna = argv.rx_antenna self.phy_tx_antenna = argv.tx_antenna - self.phy_freq_offset_hz = argv.freq_offset + self.phy_freq_offset = argv.freq_offset self.phy_ppm = argv.ppm # Set up signal handlers @@ -63,7 +63,7 @@ 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.phy_freq_offset_hz, self.bind_addr, + self.phy_freq_offset, self.bind_addr, self.remote_addr, self.base_port) # Power measurement emulation diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index a9b0358..85970a9 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -85,7 +85,7 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - phy_freq_offset_hz, trx_bind_addr, + phy_freq_offset, trx_bind_addr, trx_remote_addr, trx_base_port): print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" @@ -97,7 +97,7 @@ self.rx_gain = phy_rx_gain self.tx_gain = phy_tx_gain self.ppm = phy_ppm - self.freq_offset_hz = phy_freq_offset_hz + self.freq_offset = phy_freq_offset gr.top_block.__init__(self, "GR-GSM TRX") @@ -279,19 +279,19 @@ return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate def set_rx_freq(self, fc): - fc += self.freq_offset_hz + fc += self.freq_offset print("[#] Shifting RX freq. to %s (offset is %s)" % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + eng_notation.num_to_str(self.freq_offset))) self.phy_src.set_center_freq(fc, 0) self.rotator_src.set_phase_inc(self.calc_phase_inc(fc)) self.rx_freq = fc def set_tx_freq(self, fc): - fc += self.freq_offset_hz + fc += self.freq_offset print("[#] Shifting TX freq. to %s (offset is %s)" % (eng_notation.num_to_str(fc), - eng_notation.num_to_str(self.freq_offset_hz))) + eng_notation.num_to_str(self.freq_offset))) self.phy_sink.set_center_freq(fc, 0) self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc)) self.tx_freq = fc -- To view, visit https://gerrit.osmocom.org/10933 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: I509771c3fe072069a680f66b0763ae6825f6d529 Gerrit-Change-Number: 10933 Gerrit-PatchSet: 2 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 16:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 13 Sep 2018 16:56:14 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10941 Change subject: trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode ...................................................................... trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode GSM48_CMODE_SIGN means 'signaling only', so we shall not send bad frame indications in this state. Instead, it makes sense to send dummy L2 frames like we do for xCCH channels. Change-Id: Ie39d53522cafab265099076b3194fa96aff217ba --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_tchf.c 2 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/10941/1 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 2767b90..95e496b 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -145,7 +145,6 @@ size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan) { switch (lchan->tch_mode) { - case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: if (lchan->type == TRXC_TCHF) { /* Full Rate */ memset(l2, 0x00, GSM_FR_BYTES); @@ -163,6 +162,9 @@ case GSM48_CMODE_SPEECH_AMR: /* Adaptive Multi Rate */ /* FIXME: AMR is not implemented yet */ return 0; + case GSM48_CMODE_SIGN: + LOGP(DSCH, LOGL_ERROR, "BFI is not allowed in signalling mode\n"); + return 0; default: 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 f6465f9..09d504f 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -151,13 +151,18 @@ 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; + /* BFI is not applicable in signalling mode */ + if (lchan->tch_mode == GSM48_CMODE_SIGN) + return sched_send_dt_ind(trx, ts, lchan, NULL, 0, + n_errors, true, false); + + /* Bad frame indication */ + l2_len = sched_bad_frame_ind(l2, lchan); + /* Send a BFI frame to the higher layers */ return sched_send_dt_ind(trx, ts, lchan, l2, l2_len, n_errors, true, true); -- To view, visit https://gerrit.osmocom.org/10941 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: Ie39d53522cafab265099076b3194fa96aff217ba Gerrit-Change-Number: 10941 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 13 16:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 13 Sep 2018 16:56:14 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TDMA frame math helpers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10942 Change subject: trxcon/scheduler: introduce TDMA frame math helpers ...................................................................... trxcon/scheduler: introduce TDMA frame math helpers The 'normal' math operations, such as addition and substraction, are not applicable for TDMA frame numbers because they may result in out-of-range values. Having TDMA frame math helpers in a single place would allow one to avoid possible out-of-range result mistakes. Change-Id: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_trx.c M src/host/trxcon/scheduler.h 3 files changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/42/10942/1 diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 56b89a2..8a9527c 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -84,8 +84,7 @@ timespecadd(tv_clock, &frame_duration, tv_clock); elapsed_us -= FRAME_DURATION_uS; - sched->fn_counter_proc = (sched->fn_counter_proc + 1) - % GSM_HYPERFRAME; + sched->fn_counter_proc = TDMA_FN_INC(sched->fn_counter_proc); /* Call frame callback */ if (sched->clock_cb) @@ -143,8 +142,7 @@ /* Calculate elapsed time / frames since last processed fn */ 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; + elapsed_fn = TDMA_FN_SUB(fn, sched->fn_counter_proc); if (elapsed_fn >= 135774) elapsed_fn -= GSM_HYPERFRAME; @@ -182,8 +180,7 @@ /* Transmit what we still need to transmit */ while (fn != sched->fn_counter_proc) { - sched->fn_counter_proc = (sched->fn_counter_proc + 1) - % GSM_HYPERFRAME; + sched->fn_counter_proc = TDMA_FN_INC(sched->fn_counter_proc); /* Call frame callback */ if (sched->clock_cb) diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 8bd3c72..e20da39 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -65,8 +65,8 @@ * Advance frame number, giving the transceiver more * time until a burst must be transmitted... */ - fn = (sched->fn_counter_proc + sched->fn_counter_advance) - % GSM_HYPERFRAME; + fn = TDMA_FN_SUM(sched->fn_counter_proc, + sched->fn_counter_advance); /* Get frame from multiframe */ offset = fn % ts->mf_layout->period; @@ -608,15 +608,14 @@ } /* Calculate how many frames have been elapsed */ - elapsed = (burst_fn + GSM_HYPERFRAME - ts->mf_last_fn); - elapsed %= GSM_HYPERFRAME; + elapsed = TDMA_FN_SUB(burst_fn, ts->mf_last_fn); /** * If not too many frames have been elapsed, * start counting from last fn + 1 */ if (elapsed < 10) - fn = (ts->mf_last_fn + 1) % GSM_HYPERFRAME; + fn = TDMA_FN_INC(ts->mf_last_fn); else fn = burst_fn; @@ -658,7 +657,7 @@ if (fn == burst_fn) break; - fn = (fn + 1) % GSM_HYPERFRAME; + fn = TDMA_FN_INC(fn); } /* Set last processed frame number */ diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index 6c3a2f2..6b70b41 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -8,6 +8,14 @@ #define GSM_SUPERFRAME (26 * 51) #define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME) +/* TDMA frame number arithmetics */ +#define TDMA_FN_INC(fn) \ + ((fn + 1) % GSM_HYPERFRAME) +#define TDMA_FN_SUM(a, b) \ + ((a + b) % GSM_HYPERFRAME) +#define TDMA_FN_SUB(a, b) \ + ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME) + enum tdma_sched_clck_state { SCH_CLCK_STATE_WAIT, SCH_CLCK_STATE_OK, -- To view, visit https://gerrit.osmocom.org/10942 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: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 Gerrit-Change-Number: 10942 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 13 20:03:36 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:03:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9ac2a5a42c1_4c4de8c68c331447@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 218s] No package 'libpcsclite' found [ 218s] simtrace2-remsim.o: In function `main': [ 218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 218s] apdu_dispatch.o: In function `apdu_segment_in': [ 218s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 218s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 218s] collect2: error: ld returned 1 exit status [ 218s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 218s] make[2]: *** [simtrace2-remsim] Error 1 [ 218s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 218s] Makefile:20: recipe for target 'utils' failed [ 218s] make[1]: *** [utils] Error 2 [ 218s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 218s] dh_auto_build: make -j1 returned exit code 2 [ 218s] debian/rules:4: recipe for target 'build' failed [ 218s] make: *** [build] Error 2 [ 218s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 218s] [ 218s] lamb58 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:03:21 UTC 2018. [ 218s] [ 218s] ### VM INTERACTION START ### [ 222s] [ 210.957584] sysrq: SysRq : Power Off [ 222s] [ 210.988750] reboot: Power down [ 222s] ### VM INTERACTION END ### [ 222s] [ 222s] lamb58 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:03:25 UTC 2018. [ 222s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:03:19 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:03:19 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9ac2a4818b0_4c4de8c68c3312f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 179s] No package 'libpcsclite' found [ 179s] simtrace2-remsim.o: In function `main': [ 179s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 179s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 179s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 179s] apdu_dispatch.o: In function `apdu_segment_in': [ 179s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 179s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 179s] collect2: error: ld returned 1 exit status [ 179s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 179s] make[2]: *** [simtrace2-remsim] Error 1 [ 179s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 179s] Makefile:20: recipe for target 'utils' failed [ 179s] make[1]: *** [utils] Error 2 [ 179s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 179s] dh_auto_build: make -j1 returned exit code 2 [ 179s] debian/rules:4: recipe for target 'build' failed [ 179s] make: *** [build] Error 2 [ 179s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 179s] [ 179s] cloud101 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:02:58 UTC 2018. [ 179s] [ 179s] ### VM INTERACTION START ### [ 182s] [ 155.180057] sysrq: SysRq : Power Off [ 182s] [ 155.190301] reboot: Power down [ 184s] ### VM INTERACTION END ### [ 184s] [ 184s] cloud101 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:03:04 UTC 2018. [ 184s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:03:19 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:03:19 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9ac2a4e3cb7_4c4de8c68c3313a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 183s] No package 'libpcsclite' found [ 183s] simtrace2-remsim.o: In function `main': [ 183s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 183s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 183s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 183s] apdu_dispatch.o: In function `apdu_segment_in': [ 183s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 183s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 183s] collect2: error: ld returned 1 exit status [ 183s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 183s] make[2]: *** [simtrace2-remsim] Error 1 [ 183s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 183s] Makefile:20: recipe for target 'utils' failed [ 183s] make[1]: *** [utils] Error 2 [ 183s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 183s] dh_auto_build: make -j1 returned exit code 2 [ 183s] debian/rules:4: recipe for target 'build' failed [ 183s] make: *** [build] Error 2 [ 183s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 183s] [ 183s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:03:04 UTC 2018. [ 183s] [ 183s] ### VM INTERACTION START ### [ 187s] [ 175.110315] sysrq: SysRq : Power Off [ 187s] [ 175.170061] reboot: Power down [ 187s] ### VM INTERACTION END ### [ 187s] [ 187s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:03:08 UTC 2018. [ 187s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:04:45 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:04:45 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9ac2fa2bac8_4c4de8c68c3317c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 204s] No package 'libpcsclite' found [ 204s] simtrace2-remsim.o: In function `main': [ 204s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 204s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 204s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 204s] apdu_dispatch.o: In function `apdu_segment_in': [ 204s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 204s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 204s] collect2: error: ld returned 1 exit status [ 204s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 204s] make[2]: *** [simtrace2-remsim] Error 1 [ 204s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 204s] Makefile:20: recipe for target 'utils' failed [ 204s] make[1]: *** [utils] Error 2 [ 204s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 204s] dh_auto_build: make -j1 returned exit code 2 [ 204s] debian/rules:4: recipe for target 'build' failed [ 204s] make: *** [build] Error 2 [ 204s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 204s] [ 204s] cloud125 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:04:29 UTC 2018. [ 204s] [ 204s] ### VM INTERACTION START ### [ 207s] [ 180.938984] sysrq: SysRq : Power Off [ 207s] [ 180.952643] reboot: Power down [ 208s] ### VM INTERACTION END ### [ 208s] [ 208s] cloud125 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:04:33 UTC 2018. [ 208s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:05:02 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:05:02 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9ac2fbb7dcd_4c4de8c68c33208a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 241s] No package 'libpcsclite' found [ 241s] simtrace2-remsim.o: In function `main': [ 241s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 241s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 241s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 241s] apdu_dispatch.o: In function `apdu_segment_in': [ 241s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 241s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 241s] collect2: error: ld returned 1 exit status [ 241s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 241s] make[2]: *** [simtrace2-remsim] Error 1 [ 241s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 241s] Makefile:20: recipe for target 'utils' failed [ 241s] make[1]: *** [utils] Error 2 [ 241s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 241s] dh_auto_build: make -j1 returned exit code 2 [ 241s] debian/rules:4: recipe for target 'build' failed [ 241s] make: *** [build] Error 2 [ 241s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 241s] [ 241s] lamb59 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:04:52 UTC 2018. [ 241s] [ 241s] ### VM INTERACTION START ### [ 244s] [ 230.713492] sysrq: SysRq : Power Off [ 244s] [ 230.722080] reboot: Power down [ 244s] ### VM INTERACTION END ### [ 244s] [ 244s] lamb59 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:04:56 UTC 2018. [ 244s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:05:53 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:05:53 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9ac3359926e_4c4de8c68c3322ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 196s] No package 'libpcsclite' found [ 196s] simtrace2-remsim.o: In function `main': [ 196s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 196s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 196s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 196s] apdu_dispatch.o: In function `apdu_segment_in': [ 196s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 196s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 196s] collect2: error: ld returned 1 exit status [ 196s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 196s] make[2]: *** [simtrace2-remsim] Error 1 [ 196s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 196s] Makefile:20: recipe for target 'utils' failed [ 196s] make[1]: *** [utils] Error 2 [ 196s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 196s] dh_auto_build: make -j1 returned exit code 2 [ 196s] debian/rules:4: recipe for target 'build' failed [ 196s] make: *** [build] Error 2 [ 196s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 196s] [ 196s] lamb59 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:05:47 UTC 2018. [ 196s] [ 196s] ### VM INTERACTION START ### [ 199s] [ 176.502195] sysrq: SysRq : Power Off [ 199s] [ 176.511772] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] lamb59 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:05:50 UTC 2018. [ 199s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:07:36 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:07:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9ac390b7b83_4c4de8c68c332442@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 217s] No package 'libpcsclite' found [ 217s] simtrace2-remsim.o: In function `main': [ 217s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 217s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 217s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 217s] apdu_dispatch.o: In function `apdu_segment_in': [ 217s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 217s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 217s] collect2: error: ld returned 1 exit status [ 217s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 217s] make[2]: *** [simtrace2-remsim] Error 1 [ 217s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 217s] Makefile:20: recipe for target 'utils' failed [ 217s] make[1]: *** [utils] Error 2 [ 217s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 217s] dh_auto_build: make -j1 returned exit code 2 [ 217s] debian/rules:4: recipe for target 'build' failed [ 217s] make: *** [build] Error 2 [ 217s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 217s] [ 217s] cloud121 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:07:29 UTC 2018. [ 217s] [ 217s] ### VM INTERACTION START ### [ 220s] [ 188.811222] sysrq: SysRq : Power Off [ 220s] [ 188.819448] reboot: Power down [ 222s] ### VM INTERACTION END ### [ 222s] [ 222s] cloud121 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:07:35 UTC 2018. [ 222s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:11:07 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:11:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9ac4635c6eb_4c4de8c68c332680@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 196s] No package 'libpcsclite' found [ 196s] simtrace2-remsim.o: In function `main': [ 196s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 196s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 196s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 196s] apdu_dispatch.o: In function `apdu_segment_in': [ 196s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 196s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 196s] collect2: error: ld returned 1 exit status [ 196s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 196s] make[2]: *** [simtrace2-remsim] Error 1 [ 196s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 196s] Makefile:20: recipe for target 'utils' failed [ 196s] make[1]: *** [utils] Error 2 [ 196s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 196s] dh_auto_build: make -j1 returned exit code 2 [ 196s] debian/rules:4: recipe for target 'build' failed [ 196s] make: *** [build] Error 2 [ 196s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 196s] [ 196s] wildcard2 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:10:43 UTC 2018. [ 196s] [ 196s] ### VM INTERACTION START ### [ 200s] [ 175.407831] sysrq: SysRq : Power Off [ 200s] [ 175.411026] reboot: Power down [ 204s] ### VM INTERACTION END ### [ 204s] [ 204s] wildcard2 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:10:50 UTC 2018. [ 204s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:17:06 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:17:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b9ac5cc52fc9_4c4de8c68c3339f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 75s] #define HAVE_SYS_STAT_H 1 [ 75s] #define HAVE_STDLIB_H 1 [ 75s] #define HAVE_STRING_H 1 [ 75s] #define HAVE_MEMORY_H 1 [ 75s] #define HAVE_STRINGS_H 1 [ 75s] #define HAVE_INTTYPES_H 1 [ 75s] #define HAVE_STDINT_H 1 [ 75s] #define HAVE_UNISTD_H 1 [ 75s] #define HAVE_DLFCN_H 1 [ 75s] #define LT_OBJDIR ".libs/" [ 75s] [ 75s] configure: exit 1 [ 75s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 75s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 75s] make[1]: *** [override_dh_auto_configure] Error 255 [ 75s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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 [ 75s] [ 75s] lamb63 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:16:55 UTC 2018. [ 75s] [ 75s] ### VM INTERACTION START ### [ 76s] Powering off. [ 76s] [ 64.792487] reboot: Power down [ 76s] ### VM INTERACTION END ### [ 76s] [ 76s] lamb63 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:16:57 UTC 2018. [ 76s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:17:06 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:17:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9ac5cbab432_4c4de8c68c3338e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn 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 --with-systemdsystemunitdir=/lib/systemd/system 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 gave error exit status 2 [ 88s] [ 88s] lamb21 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:16:45 UTC 2018. [ 88s] [ 88s] ### VM INTERACTION START ### [ 91s] [ 79.772678] sysrq: SysRq : Power Off [ 91s] [ 79.777944] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] lamb21 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:16:50 UTC 2018. [ 91s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:17:23 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:17:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b9ac5e59c2bc_4c4de8c68c334057@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 136s] #define HAVE_SYS_STAT_H 1 [ 136s] #define HAVE_STDLIB_H 1 [ 136s] #define HAVE_STRING_H 1 [ 136s] #define HAVE_MEMORY_H 1 [ 136s] #define HAVE_STRINGS_H 1 [ 136s] #define HAVE_INTTYPES_H 1 [ 136s] #define HAVE_STDINT_H 1 [ 136s] #define HAVE_UNISTD_H 1 [ 136s] #define HAVE_DLFCN_H 1 [ 136s] #define LT_OBJDIR ".libs/" [ 136s] [ 136s] configure: exit 1 [ 136s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 136s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 136s] make[1]: *** [override_dh_auto_configure] Error 255 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] debian/rules:45: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] cloud122 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:17:14 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 137s] Powering off. [ 137s] [ 92.963589] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] cloud122 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:17:17 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:19:23 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:19:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9ac6645c8a2_4c4de8c68c3343a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 98s] #define HAVE_SYS_STAT_H 1 [ 98s] #define HAVE_STDLIB_H 1 [ 98s] #define HAVE_STRING_H 1 [ 98s] #define HAVE_MEMORY_H 1 [ 98s] #define HAVE_STRINGS_H 1 [ 98s] #define HAVE_INTTYPES_H 1 [ 98s] #define HAVE_STDINT_H 1 [ 98s] #define HAVE_UNISTD_H 1 [ 98s] #define HAVE_DLFCN_H 1 [ 98s] #define LT_OBJDIR ".libs/" [ 98s] [ 98s] configure: exit 1 [ 98s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 98s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 98s] make[1]: *** [override_dh_auto_configure] Error 255 [ 98s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 98s] debian/rules:45: recipe for target 'build' failed [ 98s] make: *** [build] Error 2 [ 98s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 98s] [ 98s] lamb27 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:19:02 UTC 2018. [ 98s] [ 98s] ### VM INTERACTION START ### [ 101s] [ 89.514171] sysrq: SysRq : Power Off [ 101s] [ 89.518609] reboot: Power down [ 102s] ### VM INTERACTION END ### [ 102s] [ 102s] lamb27 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:19:07 UTC 2018. [ 102s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:19:43 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:19:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9ac66558169_4c4de8c68c3344e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 91s] #define HAVE_SYS_STAT_H 1 [ 91s] #define HAVE_STDLIB_H 1 [ 91s] #define HAVE_STRING_H 1 [ 91s] #define HAVE_MEMORY_H 1 [ 91s] #define HAVE_STRINGS_H 1 [ 91s] #define HAVE_INTTYPES_H 1 [ 91s] #define HAVE_STDINT_H 1 [ 91s] #define HAVE_UNISTD_H 1 [ 91s] #define HAVE_DLFCN_H 1 [ 91s] #define LT_OBJDIR ".libs/" [ 91s] [ 91s] configure: exit 1 [ 91s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 91s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 91s] make[1]: *** [override_dh_auto_configure] Error 2 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 91s] debian/rules:45: recipe for target 'build' failed [ 91s] make: *** [build] Error 2 [ 91s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 91s] [ 91s] lamb15 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:19:20 UTC 2018. [ 91s] [ 91s] ### VM INTERACTION START ### [ 94s] [ 83.421185] sysrq: SysRq : Power Off [ 94s] [ 83.426362] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] lamb15 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:19:24 UTC 2018. [ 94s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:20:00 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:20:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9ac67f21975_4c4de8c68c3345a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 98s] #define HAVE_SYS_STAT_H 1 [ 98s] #define HAVE_STDLIB_H 1 [ 98s] #define HAVE_STRING_H 1 [ 98s] #define HAVE_MEMORY_H 1 [ 98s] #define HAVE_STRINGS_H 1 [ 98s] #define HAVE_INTTYPES_H 1 [ 98s] #define HAVE_STDINT_H 1 [ 98s] #define HAVE_UNISTD_H 1 [ 98s] #define HAVE_DLFCN_H 1 [ 98s] #define LT_OBJDIR ".libs/" [ 98s] [ 98s] configure: exit 1 [ 98s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 98s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 98s] make[1]: *** [override_dh_auto_configure] Error 255 [ 98s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 98s] debian/rules:45: recipe for target 'build' failed [ 98s] make: *** [build] Error 2 [ 98s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 98s] [ 98s] lamb16 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:19:38 UTC 2018. [ 98s] [ 98s] ### VM INTERACTION START ### [ 101s] [ 90.328616] sysrq: SysRq : Power Off [ 102s] [ 90.360669] reboot: Power down [ 102s] ### VM INTERACTION END ### [ 102s] [ 102s] lamb16 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:19:43 UTC 2018. [ 102s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:23:07 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:23:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9ac7343d0b7_4c4de8c68c3352cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 101s] #define HAVE_SYS_STAT_H 1 [ 101s] #define HAVE_STDLIB_H 1 [ 101s] #define HAVE_STRING_H 1 [ 101s] #define HAVE_MEMORY_H 1 [ 101s] #define HAVE_STRINGS_H 1 [ 101s] #define HAVE_INTTYPES_H 1 [ 101s] #define HAVE_STDINT_H 1 [ 101s] #define HAVE_UNISTD_H 1 [ 101s] #define HAVE_DLFCN_H 1 [ 101s] #define LT_OBJDIR ".libs/" [ 101s] [ 101s] configure: exit 1 [ 101s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 101s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 101s] make[1]: *** [override_dh_auto_configure] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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] lamb70 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:23:01 UTC 2018. [ 101s] [ 101s] ### VM INTERACTION START ### [ 104s] [ 93.425389] sysrq: SysRq : Power Off [ 104s] [ 93.433146] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] lamb70 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:23:05 UTC 2018. [ 104s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:26:32 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:26:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9ac806c752_4c4de8c68c3356e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 151s] #define HAVE_SYS_STAT_H 1 [ 151s] #define HAVE_STDLIB_H 1 [ 151s] #define HAVE_STRING_H 1 [ 151s] #define HAVE_MEMORY_H 1 [ 151s] #define HAVE_STRINGS_H 1 [ 151s] #define HAVE_INTTYPES_H 1 [ 151s] #define HAVE_STDINT_H 1 [ 151s] #define HAVE_UNISTD_H 1 [ 151s] #define HAVE_DLFCN_H 1 [ 151s] #define LT_OBJDIR ".libs/" [ 151s] [ 151s] configure: exit 1 [ 151s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 151s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 151s] make[1]: *** [override_dh_auto_configure] Error 2 [ 151s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 151s] debian/rules:45: recipe for target 'build' failed [ 151s] make: *** [build] Error 2 [ 151s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 151s] [ 151s] cloud119 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:26:17 UTC 2018. [ 151s] [ 151s] ### VM INTERACTION START ### [ 155s] [ 98.400762] sysrq: SysRq : Power Off [ 155s] [ 98.491971] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] cloud119 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:26:22 UTC 2018. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:27:23 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:27:23 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9ac83f9fbb1_4c4de8c68c3359da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 355s] No package 'libpcsclite' found [ 356s] simtrace2-remsim.o: In function `main': [ 356s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 356s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 356s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 356s] apdu_dispatch.o: In function `apdu_segment_in': [ 356s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 356s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 356s] collect2: error: ld returned 1 exit status [ 356s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 356s] make[2]: *** [simtrace2-remsim] Error 1 [ 356s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 356s] Makefile:20: recipe for target 'utils' failed [ 356s] make[1]: *** [utils] Error 2 [ 356s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 356s] dh_auto_build: make -j1 returned exit code 2 [ 356s] debian/rules:4: recipe for target 'build' failed [ 356s] make: *** [build] Error 2 [ 356s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 356s] [ 356s] armbuild13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:27:13 UTC 2018. [ 356s] [ 356s] ### VM INTERACTION START ### [ 359s] [ 307.742362] SysRq : Power Off [ 359s] [ 307.743627] reboot: Power down [ 359s] ### VM INTERACTION END ### [ 359s] [ 359s] armbuild13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 13 20:27:16 UTC 2018. [ 359s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:28:32 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:28:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9ac87a23cdf_4c4de8c68c3361fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn 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=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 --with-systemdsystemunitdir=/lib/systemd/system 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 gave error exit status 2 [ 131s] [ 131s] cloud106 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:28:12 UTC 2018. [ 131s] [ 131s] ### VM INTERACTION START ### [ 134s] [ 104.823519] sysrq: SysRq : Power Off [ 134s] [ 104.861525] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] cloud106 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:28:17 UTC 2018. [ 135s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:30:49 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:30:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9ac910246bd_4c4de8c68c33729f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 100s] #define HAVE_SYS_STAT_H 1 [ 100s] #define HAVE_STDLIB_H 1 [ 100s] #define HAVE_STRING_H 1 [ 100s] #define HAVE_MEMORY_H 1 [ 100s] #define HAVE_STRINGS_H 1 [ 100s] #define HAVE_INTTYPES_H 1 [ 100s] #define HAVE_STDINT_H 1 [ 100s] #define HAVE_UNISTD_H 1 [ 100s] #define HAVE_DLFCN_H 1 [ 100s] #define LT_OBJDIR ".libs/" [ 100s] [ 100s] configure: exit 1 [ 100s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 100s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 100s] make[1]: *** [override_dh_auto_configure] Error 2 [ 100s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 100s] debian/rules:45: recipe for target 'build' failed [ 100s] make: *** [build] Error 2 [ 100s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 100s] [ 100s] lamb66 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:30:28 UTC 2018. [ 100s] [ 100s] ### VM INTERACTION START ### [ 103s] [ 92.181710] sysrq: SysRq : Power Off [ 103s] [ 92.188472] reboot: Power down [ 103s] ### VM INTERACTION END ### [ 103s] [ 103s] lamb66 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:30:32 UTC 2018. [ 103s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 13 20:53:41 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Sep 2018 20:53:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9ace5b49f93_4c4de8c68c344598@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 165s] #define HAVE_SYS_STAT_H 1 [ 165s] #define HAVE_STDLIB_H 1 [ 165s] #define HAVE_STRING_H 1 [ 165s] #define HAVE_MEMORY_H 1 [ 165s] #define HAVE_STRINGS_H 1 [ 165s] #define HAVE_INTTYPES_H 1 [ 165s] #define HAVE_STDINT_H 1 [ 165s] #define HAVE_UNISTD_H 1 [ 165s] #define HAVE_DLFCN_H 1 [ 165s] #define LT_OBJDIR ".libs/" [ 165s] [ 165s] configure: exit 1 [ 165s] 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 --with-systemdsystemunitdir=/lib/systemd/system returned exit code 1 [ 165s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 165s] make[1]: *** [override_dh_auto_configure] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] debian/rules:45: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] [ 165s] armbuild17 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:53:27 UTC 2018. [ 165s] [ 165s] ### VM INTERACTION START ### [ 168s] [ 129.359531] SysRq : Power Off [ 168s] [ 129.361126] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] armbuild17 failed "build osmo-sgsn_1.3.0.45.f7198.dsc" at Thu Sep 13 20:53:30 UTC 2018. [ 168s] -- 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 Sep 14 01:09:53 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 14 Sep 2018 01:09:53 +0000 Subject: Change in osmo-sgsn[master]: debian: add missing build dependencies Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10943 Change subject: debian: add missing build dependencies ...................................................................... debian: add missing build dependencies Change-Id: I0d552f938224e553187f0b4da06eac90fc025c95 --- M debian/control 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/10943/1 diff --git a/debian/control b/debian/control index 46a6b67..8e34dbe 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ automake, libtool, pkg-config, + libasn1c-dev, libtalloc-dev, libc-ares-dev, libgtp-dev, @@ -17,6 +18,7 @@ libosmo-abis-dev, libosmo-ranap-dev, libosmo-sccp-dev, + libosmo-sigtran-dev, libosmo-netif-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git -- To view, visit https://gerrit.osmocom.org/10943 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: I0d552f938224e553187f0b4da06eac90fc025c95 Gerrit-Change-Number: 10943 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 10:22:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 10:22:11 +0000 Subject: Change in osmo-sgsn[master]: debian: add missing build dependencies In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10943 ) Change subject: debian: add missing build dependencies ...................................................................... Patch Set 1: Code-Review+2 this patch is actually a duplicate of my patch submited in https://gerrit.osmocom.org/#/c/osmo-sgsn/+/10938/1/debian/control Basically I pushed the wrong version of the patch enabling IU which didn't contain these extra lines. But I see my patch actually adds a duplicate libosmo-ranap-dev, so I'll drop mine in favour of yours. -- To view, visit https://gerrit.osmocom.org/10943 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: I0d552f938224e553187f0b4da06eac90fc025c95 Gerrit-Change-Number: 10943 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 10:22: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 Sep 14 10:23:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 10:23:00 +0000 Subject: Change in osmo-sgsn[master]: debian: Add missing dependencies to build with IU support In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10938 ) Change subject: debian: Add missing dependencies to build with IU support ...................................................................... Abandoned Dropping in favor of https://gerrit.osmocom.org/#/c/osmo-sgsn/+/10943/ -- To view, visit https://gerrit.osmocom.org/10938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic8bfef3a72d5e8ba7ecf1f4fb27f7007c5fa5f19 Gerrit-Change-Number: 10938 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 10:23:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 10:23:29 +0000 Subject: Change in osmo-sgsn[master]: debian: add missing build dependencies In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10943 ) Change subject: debian: add missing build dependencies ...................................................................... debian: add missing build dependencies Change-Id: I0d552f938224e553187f0b4da06eac90fc025c95 --- M debian/control 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/debian/control b/debian/control index 46a6b67..8e34dbe 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ automake, libtool, pkg-config, + libasn1c-dev, libtalloc-dev, libc-ares-dev, libgtp-dev, @@ -17,6 +18,7 @@ libosmo-abis-dev, libosmo-ranap-dev, libosmo-sccp-dev, + libosmo-sigtran-dev, libosmo-netif-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git -- To view, visit https://gerrit.osmocom.org/10943 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: I0d552f938224e553187f0b4da06eac90fc025c95 Gerrit-Change-Number: 10943 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus 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 Sep 14 12:18:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 12:18:07 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Split into .inc and _git.bb Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10944 Change subject: osmo-ggsn: Split into .inc and _git.bb ...................................................................... osmo-ggsn: Split into .inc and _git.bb Change-Id: Ic92309726c6a256c7e543a2be04725023d43d9b7 --- A recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 2 files changed, 43 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/44/10944/1 diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc new file mode 100644 index 0000000..49dd1ee --- /dev/null +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -0,0 +1,38 @@ +DESCRIPTION = "Osmocom GGSN implementation" +HOMEPAGE = "https://osmocom.org/projects/openggsn" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +DEPENDS = "libosmocore" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" +RDEPENDS_${PN} += "iptables" +RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" + +inherit autotools update-rc.d pkgconfig systemd + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${systemd_system_unitdir}/ + install -d ${D}/${sysconfdir}/osmocom/ + + install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn + install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ +} + +SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" + +INITSCRIPT_PACKAGES = "osmo-ggsn" +INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" +INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" + +CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" + +FILES_libgtp = "${libdir}/*${SOLIBS}" +FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" +FILES_libgtp-staticdev = "${libdir}/*.a" + +FILES_osmo-sgsnemu = "${bindir}/sgsnemu" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 8c948cc..5219c03 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,45 +1,10 @@ -DESCRIPTION = "Osmocom GGSN implementation" -HOMEPAGE = "https://osmocom.org/projects/openggsn" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "1.2.2+gitr${SRCPV}" -PR = "r0" +require ${PN}.inc +S = "${WORKDIR}/git" SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ - file://libgtp-queue_depth_32.patch \ + file://libgtp-queue_depth_32.patch \ " -S = "${WORKDIR}/git" - -DEPENDS = "libosmocore" - -PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" -RDEPENDS_${PN} += "iptables" -RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" - -inherit autotools update-rc.d pkgconfig systemd - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}/${sysconfdir}/osmocom/ - - install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn - install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ -} - -SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" - -INITSCRIPT_PACKAGES = "osmo-ggsn" -INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" -INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" - -CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" - -FILES_libgtp = "${libdir}/*${SOLIBS}" -FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" -FILES_libgtp-staticdev = "${libdir}/*.a" - -FILES_osmo-sgsnemu = "${bindir}/sgsnemu" +PV = "1.2.2+gitr${SRCPV}" +PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/10944 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: Ic92309726c6a256c7e543a2be04725023d43d9b7 Gerrit-Change-Number: 10944 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 Sep 14 12:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 12:23:33 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Split into .inc and _git.bb In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10944 ) Change subject: osmo-ggsn: Split into .inc and _git.bb ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10944 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: Ic92309726c6a256c7e543a2be04725023d43d9b7 Gerrit-Change-Number: 10944 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 12: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 Fri Sep 14 12:51:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Sep 2018 12:51:52 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler.h: share FRAME_DURATION_uS definition Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10945 Change subject: trxcon/scheduler.h: share FRAME_DURATION_uS definition ...................................................................... trxcon/scheduler.h: share FRAME_DURATION_uS definition Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31 --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 3 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/10945/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 1e88f8b..a8a1289 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -337,10 +337,10 @@ trx_if_cmd_poweron(l1l->trx); /* Start FBSB expire timer */ - /* TODO: share FRAME_DURATION_uS=4615 from scheduler.c */ l1l->fbsb_timer.data = l1l; l1l->fbsb_timer.cb = fbsb_timer_cb; - osmo_timer_schedule(&l1l->fbsb_timer, 0, timeout * 4615); + osmo_timer_schedule(&l1l->fbsb_timer, 0, + timeout * FRAME_DURATION_uS); exit: msgb_free(msg); diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 56b89a2..dab9578 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -43,7 +43,6 @@ #include "trx_if.h" #include "trxcon.h" -#define FRAME_DURATION_uS 4615 #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index 6c3a2f2..ddb863f 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -5,6 +5,8 @@ #include +#define FRAME_DURATION_uS 4615 + #define GSM_SUPERFRAME (26 * 51) #define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME) -- To view, visit https://gerrit.osmocom.org/10945 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: I88be6088141af6bac8d34844b71193bfef51ad31 Gerrit-Change-Number: 10945 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 13:12:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 13:12:41 +0000 Subject: Change in osmo-bts[master]: doc/examples/Makefile: Install bts-mgr cfg files used by systemd serv... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10946 Change subject: doc/examples/Makefile: Install bts-mgr cfg files used by systemd services ...................................................................... doc/examples/Makefile: Install bts-mgr cfg files used by systemd services Change-Id: Iaf362da2a9ebd6829391637252812c2be93e9c60 --- M doc/examples/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/10946/1 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 241f579..04f8279 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -12,7 +12,7 @@ sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg EXTRA_DIST += $(doc_sysmo_DATA) -OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg +OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg sysmo/sysmobts-mgr.cfg endif if ENABLE_TRX @@ -39,7 +39,7 @@ litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg EXTRA_DIST += $(doc_lc15_DATA) -OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg +OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif osmoconfdir = $(sysconfdir)/osmocom -- To view, visit https://gerrit.osmocom.org/10946 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: Iaf362da2a9ebd6829391637252812c2be93e9c60 Gerrit-Change-Number: 10946 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 Sep 14 14:37:43 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 14 Sep 2018 14:37:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync 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/10769 to look at the new patch set (#3). Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... sgsn: implement TC_attach_usim_resync Test the UMTS AKA resync procedure with USIMs. MS -> SGSN: Attach Request MS <- SGSN: Identity Request IMSI MS -> SGSN: Identity Response IMSI MS <- SGSN: Identity Request IMEI MS -> SGSN: Identity Response IMEI HLR<- SGSN: SAI Request HLR-> SGSN: SAI Response MS <- SGSN: Auth Request MS -> SGSN: Auth Failure (with AUTS) HLR<- SGSN: SAI Request (with AUTS & RAND) HLR-> SGSN: SAI Response (new key material) MS <- SGSN: Auth Request (new key material) MS -> SGSN: Auth Response MS <- SGSN: Attach Accept MS -> SGSN: Attach Complete Change-Id: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d --- M sgsn/SGSN_Tests.ttcn 1 file changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/10769/3 -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 3 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 Fri Sep 14 14:40:01 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 14 Sep 2018 14:40:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10769 ) Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... Patch Set 3: Rebased the commit -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 14 Sep 2018 14:40:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 14:50:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 14:50:23 +0000 Subject: Change in libosmo-sccp[master]: debian: Document why enable-static is used in dh_auto_configure Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10947 Change subject: debian: Document why enable-static is used in dh_auto_configure ...................................................................... debian: Document why enable-static is used in dh_auto_configure Change-Id: I4a7215d350e023dceadc5826be68ce366a185da1 --- M debian/rules 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/47/10947/1 diff --git a/debian/rules b/debian/rules index 6e69d24..0bf9673 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,8 @@ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install +# enable-static: we require the tests to link to the static libosmo-sigtran +# library to access symbols not starting with osmo_* override_dh_auto_configure: dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10947 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: I4a7215d350e023dceadc5826be68ce366a185da1 Gerrit-Change-Number: 10947 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 14 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 14 Sep 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_#246?= Message-ID: <1271148833.116.1536937806702.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_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_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 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 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_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.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_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_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 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 Fri Sep 14 15:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 15:41:52 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Split into .inc and _git.bb In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10944 ) Change subject: osmo-ggsn: Split into .inc and _git.bb ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10944 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: Ic92309726c6a256c7e543a2be04725023d43d9b7 Gerrit-Change-Number: 10944 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 15:41:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 16:19:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:14 +0000 Subject: Change in meta-telephony[laforge/nightly]: libosmo-sccp: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10948 Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... libosmo-sccp: handle systemd and cfg files through autotools Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c --- M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc 1 file changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/48/10948/1 diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 60793e3..78dd525 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,12 +3,17 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools pkgconfig systemd +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + # we require the tests to link to the static libosmo-sigtran library to # access symbols not starting with osmo_* EXTRA_OECONF_remove = "--disable-static" @@ -17,14 +22,6 @@ SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ -} - FILES_osmo-stp = " \ ${bindir}/osmo-stp \ ${sysconfdir}/osmocom/osmo-stp.cfg \ -- To view, visit https://gerrit.osmocom.org/10948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 10948 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 Sep 14 16:19:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:14 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-iuh: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10949 Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... osmo-iuh: handle systemd and cfg files through autotools Change-Id: If879153a32ae21ad63284382a420da534f30e6eb --- M recipes-osmocom/osmo-iuh/osmo-iuh.inc 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/10949/1 diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 6dfb344..ab412ad 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hnbgw.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hnbgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" SYSTEMD_PACKAGES = "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/10949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 10949 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 Sep 14 16:19:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:15 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10950 Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... osmo-hlr: handle systemd and cfg files through autotools Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/50/10950/1 diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 8f078ed..13c01f7 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,15 +14,15 @@ } do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ install -d ${D}${localstatedir}/lib/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hlr.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/10950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 10950 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 Sep 14 16:19:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:16 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10951 Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... osmo-ggsn: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 --- D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 3 files changed, 3 insertions(+), 179 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/10951/1 diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init deleted file mode 100755 index 157d6dd..0000000 --- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-ggsn -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Osmocom GSM network-in-a-box -# Description: A minimal implementation of the GSM Base Station Controller, -# Mobile Switching Center, Home Location regster and all other -# components to run a self-contained GSM network. -### END INIT INFO - -# Author: Harald Welte - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Osmocom GGSN implementation" -NAME=osmo-ggsn -DAEMON=/usr/bin/ggsn -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CONFIG_FILE=/etc/ggsn.conf - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -# . /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -# . /lib/lsb/init-functions - -DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - /sbin/modprobe tun - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - - # Check for runtime directory of nonvolatile data - if [ ! -d /var/lib/ggsn ]; then - mkdir /var/lib/ggsn - fi - - # Check for GTP restart counter - if [ ! -f /var/lib/ggsn/gsn_restart ]; then - echo 0 > /var/lib/ggsn/gsn_restart - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - #[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - # esac - ;; - stop) - #[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - #esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - #log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - #case "$?" in - # 0) log_end_msg 0 ;; - # 1) log_end_msg 1 ;; # Old process is still running - # *) log_end_msg 1 ;; # Failed to start - #esac - ;; - *) - # Failed to stop - #log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index 49dd1ee..fe0170f 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,30 +5,24 @@ DEPENDS = "libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools update-rc.d pkgconfig systemd +inherit autotools pkgconfig systemd do_install_append() { - install -d ${D}${sysconfdir}/init.d install -d ${D}${systemd_system_unitdir}/ install -d ${D}/${sysconfdir}/osmocom/ - install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ } SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" -INITSCRIPT_PACKAGES = "osmo-ggsn" -INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" -INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" - CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" FILES_libgtp = "${libdir}/*${SOLIBS}" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index a12925d..da46975 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -3,8 +3,7 @@ S = "${WORKDIR}/git" SRCREV = "${AUTOREV}" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ - file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ " PV = "1.2.2+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -- To view, visit https://gerrit.osmocom.org/10951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 10951 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 Sep 14 16:19:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:16 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10952 Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... osmo-ggsn: handle systemd and cfg files through autotools Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a --- M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc 1 file changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/52/10952/1 diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index fe0170f..0aaf418 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,22 +5,19 @@ DEPENDS = "libosmocore" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools pkgconfig systemd - -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}/${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ -} - SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" -- To view, visit https://gerrit.osmocom.org/10952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 10952 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 Sep 14 16:19:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:16 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sgsn: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10953 Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... osmo-sgsn: handle systemd and cfg files through autotools At the same time systemd services were installed by autotools, osmo-gtphub service became available too. Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 --- M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 1 file changed, 8 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/53/10953/1 diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 4711a2c..45256a5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,29 +5,22 @@ DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gtphub/osmo-gtphub.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-gbproxy.service ${D}${systemd_system_unitdir}/ -} - PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" +SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -- To view, visit https://gerrit.osmocom.org/10953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 10953 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 Sep 14 16:19:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:16 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10954 Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... osmo-mgw: handle systemd and cfg files through autotools Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/54/10954/1 diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index 19e17ab..c00f998 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg - install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -- To view, visit https://gerrit.osmocom.org/10954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 10954 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 Sep 14 16:19:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:17 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10955 Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... osmo-msc: handle systemd and cfg files through autotools Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/55/10955/1 diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index e5364cd..59280ce 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,23 +5,20 @@ DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "smpp ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + smpp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh," PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34," RDEPENDS_${PN} = "libdbd-sqlite3" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_system_unitdir}/ -} - SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg" -- To view, visit https://gerrit.osmocom.org/10955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 10955 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 Sep 14 16:19:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:17 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10956 Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... osmo-bsc: handle systemd and cfg files through autotools Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 --- M recipes-osmocom/osmo-bsc/osmo-bsc.inc 1 file changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/56/10956/1 diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index d066a58..484a779 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,18 +5,14 @@ DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" -- To view, visit https://gerrit.osmocom.org/10956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 10956 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 Sep 14 16:19:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:17 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sip-connector: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10957 Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... osmo-sip-connector: handle systemd and cfg files through autotools Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 --- M recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/57/10957/1 diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc index d7f22a3..96d3734 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc @@ -5,17 +5,15 @@ DEPENDS = "sofia-sip libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" - install -m 0644 ${S}/doc/examples/osmo-sip-connector.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-sip-connector.service ${D}${systemd_system_unitdir}/ -} SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg" -- To view, visit https://gerrit.osmocom.org/10957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 10957 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 Sep 14 16:19:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:18 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Drop untested sysvinit support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10958 Change subject: openbsc: Drop untested sysvinit support ...................................................................... openbsc: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. As update-rc.d was removed, it was noticied that systemd class inherit was missing, so this commit adds it. As a result, it's not required to define systemd service file paths in FILES_*. Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init D recipes-osmocom/openbsc/openbsc/osmo-nitb.init M recipes-osmocom/openbsc/openbsc_git.bb 4 files changed, 2 insertions(+), 119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/58/10958/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ec130db..ca3b124 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,15 +6,11 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -SRC_URI = "file://osmo-nitb.init \ - file://osmo-bsc-sccplite.init \ - " - INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" -inherit autotools update-rc.d pkgconfig +inherit autotools systemd pkgconfig do_install_append() { install -d ${D}${sysconfdir}/osmocom @@ -23,12 +19,6 @@ install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - # Install sysv-init files - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rc5.d - install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb - install -m 0775 ${WORKDIR}/osmo-bsc-sccplite.init ${D}${sysconfdir}/init.d/osmo-bsc-sccplite - # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ @@ -42,27 +32,18 @@ PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" -INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" -INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ ${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg \ - ${sysconfdir}/init.d/osmo-bsc-sccplite \ - ${systemd_system_unitdir}/osmo-bsc-sccplite.service \ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" -INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" -INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ - ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" @@ -70,7 +51,6 @@ FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - ${systemd_system_unitdir}/osmo-bsc-nat.service \ " CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" @@ -78,5 +58,4 @@ FILES_osmo-bsc-mgcp = " \ ${bindir}/osmo-bsc_mgcp \ ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ " diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init deleted file mode 100755 index 3186f6d..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-bsc-sccplite -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Base Station Controller (legacy, with SCCPLite) -### END INIT INFO - -DAEMON=/usr/bin/osmo-bsc-sccplite -NAME=osmo-bsc-sccplite -DESC="Osmocom GSM Base Station Controller" -NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-sccplite.cfg -r /var/run/openbsc.ctl" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-bsc-sccplite || . /etc/default/osmo-bsc-sccplite -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init deleted file mode 100755 index bd74cc0..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-nitb -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Network in the Box -### END INIT INFO - -DAEMON=/usr/bin/osmo-nitb -NAME=osmo-nitb -DESC="Osmocom GSM Network in the Box" -NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-nitb || . /etc/default/osmo-nitb -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 0d0dda9..7fc6308 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -5,6 +5,6 @@ PR = "${INC_PR}.0" SRCREV = "${AUTOREV}" -SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" +SRC_URI = "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" -- To view, visit https://gerrit.osmocom.org/10958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 10958 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 Sep 14 16:19:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:19:18 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: handle systemd and cfg files through autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10959 Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... openbsc: handle systemd and cfg files through autotools Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/59/10959/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca3b124..71921b7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,30 +6,21 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r4.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" inherit autotools systemd pkgconfig do_install_append() { - install -d ${D}${sysconfdir}/osmocom - install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg - install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - - # Install systemd files and enable on sysinit - install -d ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -d ${D}/var/lib/osmocom - } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -- To view, visit https://gerrit.osmocom.org/10959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 10959 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 Sep 14 16:20:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:20:56 +0000 Subject: Change in meta-telephony[laforge/nightly]: libosmo-sccp: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10948 ) Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 10948 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:20: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 Sep 14 16:20:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:20:59 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-iuh: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10949 ) Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 10949 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:20: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 Sep 14 16:21:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:02 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10950 ) Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 10950 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21: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 Sep 14 16:21:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:06 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10951 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 10951 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 16:21:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:10 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10952 ) Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 10952 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21: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 Sep 14 16:21:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:14 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sgsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10953 ) Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 10953 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 16:21:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:17 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10954 ) Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 10954 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21: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 Sep 14 16:21:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:20 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10955 ) Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 10955 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21: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 Sep 14 16:21:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:24 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10956 ) Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 10956 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16: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 Fri Sep 14 16:21:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:27 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10957 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 10957 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 16:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:30 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10958 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 10958 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21: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 Sep 14 16:21:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Sep 2018 16:21:33 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10959 ) Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 10959 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21: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 Sep 14 17:37:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 17:37:18 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... Patch Set 1: > (1 comment) Presumably the problem with the abandoned struct members just slipped through while neels was working on the lchan FSM. I will ask him. Maybe he knows more about this. -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 14 Sep 2018 17:37:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 17:40:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 17:40:01 +0000 Subject: Change in osmo-bsc[master]: LCLS: use type and tch_mode from lchan to check codec 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/10905 to look at the new patch set (#2). Change subject: LCLS: use type and tch_mode from lchan to check codec ...................................................................... LCLS: use type and tch_mode from lchan to check codec When not explicitly allowed via VTY settings, the LCLS mechanisms will avoid to locally switch connections with different codecs/rates. For example GSM HR and GSM FR would not be locally switched. At the moment osmo_bsc_lcls.c uses abandonned struct members to check if there is a codec mismatch, so a mismatch will never be detected. - Use struct member "tch_mode" and "type" from struct gsm_lchan *lchan instead of "full_rate" and "chan_mode" from struct gsm_subscriber_connection Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/10905/2 -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 17:49:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 17:49:26 +0000 Subject: Change in libosmocore[master]: gsm0808: fix wrong codec defaults for OFR_AMR_WB Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10960 Change subject: gsm0808: fix wrong codec defaults for OFR_AMR_WB ...................................................................... gsm0808: fix wrong codec defaults for OFR_AMR_WB 3GPP TS 48.008 chapter 3.2.2.103 states that the configuration bits of OFR_AMR_WB are coded as follows: "S0, S2, S4 indicates the supported Codec Configurations. S1, S3, S5, S6, S7 are reserved and coded with zeroes." The current default setting of 0x3F violates this requirement. Lets set the "forbidden" settings zu zero and keep only the allowed ones. Change-Id: I4a481def59e9c98cfdcafc2b80c0ac7df0c14130 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/10960/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 69007b5..9433817 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -499,7 +499,7 @@ GSM0808_SC_CFG_DEFAULT_HR_AMR = 0x073f, GSM0808_SC_CFG_DEFAULT_OHR_AMR = 0x57ff, GSM0808_SC_CFG_DEFAULT_FR_AMR_WB = 0x01, - GSM0808_SC_CFG_DEFAULT_OFR_AMR_WB = 0x3f, + GSM0808_SC_CFG_DEFAULT_OFR_AMR_WB = 0x15, GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; -- To view, visit https://gerrit.osmocom.org/10960 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: I4a481def59e9c98cfdcafc2b80c0ac7df0c14130 Gerrit-Change-Number: 10960 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 17:49:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 17:49:26 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10961 Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... gsm0808: add function to convert amr gsm0408 setings to gsm0808 Add a function to convert struct gsm48_multi_rate_conf, which holds the codec settings for AMR, to S0-S15 bit representation as defined in 3GPP TS 48.008 3.2.2.49 Change-Id: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 480 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/10961/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 242bce9..0a7429e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,6 +104,7 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 9433817..8431ace 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -503,6 +503,20 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; +/*! Default speech codec configurations broken down by reate. + * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for + * the Adaptive Multi-Rate Codec Types. */ +enum gsm0808_speech_codec_rate_defaults { + GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, + GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, + GSM0808_SC_CFG_DEFAULT_AMR_5_90 = 0xff06, + GSM0808_SC_CFG_DEFAULT_AMR_6_70 = 0x3e08, + GSM0808_SC_CFG_DEFAULT_AMR_7_40 = 0x0c12, + GSM0808_SC_CFG_DEFAULT_AMR_7_95 = 0xc020, + GSM0808_SC_CFG_DEFAULT_AMR_10_2 = 0x3040, + GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 +}; + /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 73f0234..4b2a5f5 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1161,6 +1161,49 @@ return 0; } +/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a + * given GSM 04.08 AMR configuration struct. + * \param[in] cfg AMR configuration in GSM 04.08 format. + * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. + * \returns configuration bits (S0-S15) */ +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, + bool fr) +{ + uint16_t s15_s0 = 0; + + /* Check each rate bit in the AMR multirate configuration and pick the + * matching default configuration as specified in 3GPP TS 28.062, + * Table 7.11.3.1.3-2. */ + if (cfg->m4_75) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_4_75; + if (cfg->m5_15) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_15; + if (cfg->m5_90) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_90; + if (cfg->m6_70) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_6_70; + if (cfg->m7_40) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_40; + if (cfg->m7_95) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_95; + if (cfg->m10_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_10_2; + if (cfg->m12_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_12_2; + + /* Note: 3GPP TS 48.008, chapter 3GPP TS 48.008 states that for AMR + * some of the configuration bits must be coded as zeros. The applied + * bitmask matches the default codec settings. See also the definition + * of enum gsm0808_speech_codec_defaults in gsm_08_08.h and + * 3GPP TS 28.062, Table 7.11.3.1.3-2. */ + if (fr) + s15_s0 &= GSM0808_SC_CFG_DEFAULT_FR_AMR; + else + s15_s0 &= GSM0808_SC_CFG_DEFAULT_HR_AMR; + + return s15_s0; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 0c40c88..3d08232 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -205,6 +205,7 @@ gsm0808_cell_id_u_name; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; +gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index ae138be..29cecb2 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1444,6 +1444,200 @@ msgb_free(msg); } +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) +{ + uint16_t s15_s0; + + printf("Input:\n"); + printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); + printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); + printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); + printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); + printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); + printf(" m7_95= %u\n", cfg->m7_95); + printf(" m10_2= %u\n", cfg->m10_2); + printf(" m12_2= %u\n", cfg->m12_2); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); + printf("Result (fr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); + printf("Result (hr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + printf("\n"); +} + +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg(void) +{ + struct gsm48_multi_rate_conf cfg; + + printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1495,6 +1689,8 @@ test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); + test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); + printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 6cd7982..dc1deba 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -74,4 +74,229 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) +Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5703 = 0b0101011100000011 +Result (hr): + S15-S0 = 0703 = 0b0000011100000011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5706 = 0b0101011100000110 +Result (hr): + S15-S0 = 0706 = 0b0000011100000110 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 1608 = 0b0001011000001000 +Result (hr): + S15-S0 = 0608 = 0b0000011000001000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0412 = 0b0000010000010010 +Result (hr): + S15-S0 = 0412 = 0b0000010000010010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 4020 = 0b0100000000100000 +Result (hr): + S15-S0 = 0020 = 0b0000000000100000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 1040 = 0b0001000001000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 4082 = 0b0100000010000010 +Result (hr): + S15-S0 = 0002 = 0b0000000000000010 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 570f = 0b0101011100001111 +Result (hr): + S15-S0 = 070f = 0b0000011100001111 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 54f2 = 0b0101010011110010 +Result (hr): + S15-S0 = 0432 = 0b0000010000110010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ce = 0b0101011111001110 +Result (hr): + S15-S0 = 070e = 0b0000011100001110 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5733 = 0b0101011100110011 +Result (hr): + S15-S0 = 0733 = 0b0000011100110011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 56aa = 0b0101011010101010 +Result (hr): + S15-S0 = 062a = 0b0000011000101010 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 5757 = 0b0101011101010111 +Result (hr): + S15-S0 = 0717 = 0b0000011100010111 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ff = 0b0101011111111111 +Result (hr): + S15-S0 = 073f = 0b0000011100111111 + Done -- To view, visit https://gerrit.osmocom.org/10961 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: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Gerrit-Change-Number: 10961 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 18:03:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:03:49 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix typo in comment Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10962 Change subject: codec_pref: fix typo in comment ...................................................................... codec_pref: fix typo in comment Change-Id: Ie4ea8179395cd331dad4b62227debb026b5b008c --- M src/osmo-bsc/codec_pref.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/10962/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 2a9be6e..96c2c38 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -167,7 +167,7 @@ /*! Match the codec preferences from local config with a received codec preferences IEs received from the * MSC and the BTS' codec configuration. * \param[out] chan_mode GSM 04.08 channel mode. - * \param[out] full_rate true iff full-rate. + * \param[out] full_rate true if full-rate. * \param[in] ct GSM 08.08 channel type received from MSC. * \param[in] scl GSM 08.08 speech codec list received from MSC (optional). * \param[in] audio_support List of allowed codecs as from local config. -- To view, visit https://gerrit.osmocom.org/10962 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: Ie4ea8179395cd331dad4b62227debb026b5b008c Gerrit-Change-Number: 10962 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 18:03:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:03:49 +0000 Subject: Change in osmo-bsc[master]: codec_pref: add AMR configuration bits to make_scl_config in unit-test Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10963 Change subject: codec_pref: add AMR configuration bits to make_scl_config in unit-test ...................................................................... codec_pref: add AMR configuration bits to make_scl_config in unit-test The the function make_scl_config() is used to generate realistically looking speech codec lists to perform the unit tests for codec_pref.c. This function does not yet populate the S0-S15 bits for AMR codecs. Lets make sure that at least the default configuration is populated here. Change-Id: I534239416c038ea856c128659f314aa521f85c15 --- M tests/codec_pref/codec_pref_test.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/10963/1 diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index b0b9f5e..efc77f6 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -78,11 +78,13 @@ case 3: /* FR3 only */ scl->codec[0].type = GSM0808_SCT_FR3; + scl->codec[0].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; scl->len = 1; break; case 4: /* HR3 only */ scl->codec[0].type = GSM0808_SCT_HR3; + scl->codec[0].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; scl->len = 1; break; case 5: @@ -102,7 +104,9 @@ /* FR1, FR3 and HR3 */ scl->codec[0].type = GSM0808_SCT_FR1; scl->codec[1].type = GSM0808_SCT_FR3; + scl->codec[1].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; scl->codec[2].type = GSM0808_SCT_HR3; + scl->codec[2].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; scl->len = 3; break; case 8: @@ -110,8 +114,10 @@ scl->codec[0].type = GSM0808_SCT_FR1; scl->codec[1].type = GSM0808_SCT_FR2; scl->codec[2].type = GSM0808_SCT_FR3; + scl->codec[2].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; scl->codec[3].type = GSM0808_SCT_HR1; scl->codec[4].type = GSM0808_SCT_HR3; + scl->codec[4].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; scl->len = 5; break; } -- To view, visit https://gerrit.osmocom.org/10963 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: I534239416c038ea856c128659f314aa521f85c15 Gerrit-Change-Number: 10963 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 18:03:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:03:49 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix missing breaks in switch-case statement Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10964 Change subject: codec_pref: fix missing breaks in switch-case statement ...................................................................... codec_pref: fix missing breaks in switch-case statement In function test_codec_support_bts() the switch case statement lacks break; statements for some cases. This may lead into messed up codec decisions. - Add missing break statements Change-Id: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 --- M src/osmo-bsc/codec_pref.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/10964/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 96c2c38..924f77f 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -148,15 +148,19 @@ case GSM0808_PERM_FR2: if (bts_codec->efr) return true; + break; case GSM0808_PERM_FR3: if (bts_codec->amr) return true; + break; case GSM0808_PERM_HR1: if (bts_codec->hr) return true; + break; case GSM0808_PERM_HR3: if (bts_codec->amr) return true; + break; default: return false; } -- To view, visit https://gerrit.osmocom.org/10964 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: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 Gerrit-Change-Number: 10964 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 18:03:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:03:50 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10965 Change subject: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION ...................................................................... codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION The COMPLETE LAYER 3 INFORMATION message lacks the Codec List (BSS Supported) information element. This information element is mandatory for networks that use an IP based user plane (AoIP). - Add function to generate the speech codec list from the current codec settings (Available codecs) - Generate and embed information element in L3 Compl. message Depends: libosmocore I4e656731b16621736c7a2f4e64d9ce63b1064e98 Change-Id: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Related: OS#3548 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c M src/osmo-bsc/gsm_08_08.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 5 files changed, 1,213 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/10965/1 diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 94fc987..03e306b 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -7,6 +7,8 @@ struct gsm0808_speech_codec_list; struct gsm_audio_support; struct bts_codec_conf; +struct bsc_msc_data; +struct gsm_bts; int match_codec_pref(enum gsm48_chan_mode *chan_mode, bool *full_rate, @@ -15,3 +17,7 @@ struct gsm_audio_support * const *audio_support, int audio_length, const struct bts_codec_conf *bts_codec); + +void gen_bss_supp_codec_list(struct gsm0808_speech_codec_list *scl, + const struct bsc_msc_data *msc, + const struct gsm_bts *bts); diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 924f77f..aa248f6 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -242,3 +242,56 @@ return 0; } + +/*! Determine the BSS supported speech codec list that is sent to the MSC with + * the COMPLETE LAYER 3 INFORMATION message. + * \param[out] scl GSM 08.08 speech codec list with BSS supported codecs. + * \param[in] msc associated msc (current codec settings). + * \param[in] bts associated bts (current codec settings). */ +void gen_bss_supp_codec_list(struct gsm0808_speech_codec_list *scl, + const struct bsc_msc_data *msc, const struct gsm_bts *bts) +{ + uint8_t perm_spch; + unsigned int i; + int rc; + uint16_t amr_s15_s0; + struct gsm48_multi_rate_conf *amr_cfg; + + memset(scl, 0, sizeof(*scl)); + + for (i = 0; i < msc->audio_length; i++) { + + /* Pick a permitted speech value from the global codec configuration list */ + perm_spch = audio_support_to_gsm88(msc->audio_support[i]); + + /* Check this permitted speech value against the BTS specific parameters. + * if the BTS does not support the codec, try the next one */ + if (!test_codec_support_bts(&bts->codec, perm_spch)) + continue; + + /* Write item into codec list */ + rc = gsm0808_speech_codec_from_chan_type(&scl->codec[scl->len], perm_spch); + if (rc != 0) + continue; + + /* AMR (HR/FR version 3) is the only codec that requires a + * codec configuration (S0-S15). Determine the current + * configuration and update the cfg flag. */ + if (msc->audio_support[i]->ver == 3) { + if (msc->audio_support[i]->hr) { + amr_cfg = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + amr_s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg, false); + } else { + amr_cfg = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + amr_s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg, true); + } + + scl->codec[scl->len].cfg = amr_s15_s0; + } + + scl->len++; + + /* FIXME: osmo-bsc has VTY options to forbid certain AMR settings. Those + * settings are currently not taken into accound. */ + } +} diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 0d7cdf0..b725401 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -446,6 +447,7 @@ char *imsi = NULL; struct msgb *resp; enum bsc_con ret; + struct gsm0808_speech_codec_list scl; /* Check the filter */ rc = bsc_filter_initial(msc->network->bsc_data, msc, conn, msg, @@ -490,8 +492,9 @@ /* check return value, if failed check msg for and send USSD */ bsc_scan_bts_msg(conn, msg); + gen_bss_supp_codec_list(&scl, msc, conn_get_bts(conn)); - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); if (!resp) { LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n"); return false; diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index efc77f6..6bda447 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -282,11 +282,36 @@ { /* Note: FR is supported by all BTSs, so there is no flag for it */ + struct gsm48_multi_rate_conf *cfg; + OSMO_ASSERT(config_no < N_CONFIG_VARIANTS); bts->codec.hr = 0; bts->codec.efr = 0; bts->codec.amr = 0; + memset(&bts->mr_full.gsm48_ie, 0, sizeof(bts->mr_full.gsm48_ie)); + memset(&bts->mr_full.gsm48_ie, 0, sizeof(bts->mr_half.gsm48_ie)); + + /* Setup an AMR configuration, this configuration is separate and does + * not influence other codecs than AMR */ + cfg = (struct gsm48_multi_rate_conf*) &bts->mr_full.gsm48_ie; + cfg->m4_75 = 1; + cfg->m5_15 = 1; + cfg->m5_90 = 1; + cfg->m6_70 = 1; + cfg->m7_40 = 1; + cfg->m7_95 = 1; + cfg->m10_2 = 1; + cfg->m12_2 = 1; + cfg = (struct gsm48_multi_rate_conf*) &bts->mr_half.gsm48_ie; + cfg->m4_75 = 1; + cfg->m5_15 = 1; + cfg->m5_90 = 1; + cfg->m6_70 = 1; + cfg->m7_40 = 1; + cfg->m7_95 = 1; + cfg->m10_2 = 0; + cfg->m12_2 = 0; switch (config_no) { case 0: @@ -590,6 +615,62 @@ free_msc_config(&msc_local); } +/* Try execute bss_supp_codec_list(), display input and output parameters */ +static void test_gen_bss_supp_codec_list(const struct bsc_msc_data *msc, struct gsm_bts *bts) +{ + unsigned int i; + struct gsm0808_speech_codec_list scl; + + printf("Determining Codec List (BSS Supported):\n"); + + printf(" * BSS: audio support settings (%u items):\n", msc->audio_length); + for (i = 0; i < msc->audio_length; i++) + if (msc->audio_support[i]->hr) + printf(" audio_support[%u]=HR%u\n", i, msc->audio_support[i]->ver); + else + printf(" audio_support[%u]=FR%u\n", i, msc->audio_support[i]->ver); + + printf(" * BTS: audio support settings:\n"); + printf(" (GSM-FR implicitly supported)\n"); + printf(" codec->hr=%u\n", bts->codec.hr); + printf(" codec->efr=%u\n", bts->codec.efr); + printf(" codec->amr=%u\n", bts->codec.amr); + + gen_bss_supp_codec_list(&scl, msc, bts); + + printf(" * result: speech codec list (%u items):\n", scl.len); + for (i = 0; i < scl.len; i++) { + printf(" codec[%u]->type=%s", i, gsm0808_speech_codec_type_name(scl.codec[i].type)); + if (msc->audio_support[i]->ver == 3) + printf(" S15-S0=%04x", scl.codec[i].cfg); + printf("\n"); + } + printf("\n"); +} + +/* Test gen_bss_supp_codec_list() with some mixed configurations */ +static void test_gen_bss_supp_codec_list_cfgs(void) +{ + struct bsc_msc_data msc_local; + struct gsm_bts bts_local; + uint8_t i; + uint8_t k; + + printf("============== test_gen_bss_supp_codec_list_cfgs ==============\n\n"); + init_msc_config(&msc_local); + + for (i = 0; i < N_CONFIG_VARIANTS; i++) { + for (k = 0; k < N_CONFIG_VARIANTS; k++) { + make_msc_config(&msc_local, i); + make_bts_config(&bts_local, k); + printf("MSC config: %u, BTS config: %u\n", i, k); + test_gen_bss_supp_codec_list(&msc_local, &bts_local); + } + } + + free_msc_config(&msc_local); +} + static const struct log_info_cat log_categories[] = { [DMSC] = { .name = "DMSC", @@ -615,6 +696,7 @@ test_msc(); test_selected_working(); test_selected_non_working(); + test_gen_bss_supp_codec_list_cfgs(); printf("Testing execution completed.\n"); talloc_free(ctx); diff --git a/tests/codec_pref/codec_pref_test.ok b/tests/codec_pref/codec_pref_test.ok index 3b36ea1..befc497 100644 --- a/tests/codec_pref/codec_pref_test.ok +++ b/tests/codec_pref/codec_pref_test.ok @@ -1018,4 +1018,1072 @@ codec->amr=1 * result: rc=-1, full_rate=0, chan_mode=SIGNALLING +============== test_gen_bss_supp_codec_list_cfgs ============== + +MSC config: 0, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 1, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 1, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 1, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 1, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 2, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR2 + +MSC config: 2, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR2 + +MSC config: 2, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR2 + +MSC config: 3, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 3, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 3, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 3, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 4, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 4, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 4, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 4, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 5, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 5, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 5, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 5, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 6, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 6, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + +MSC config: 6, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 6, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=HR1 + +MSC config: 6, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=HR1 + +MSC config: 7, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 7, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 7, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 7, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 8, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 8, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + +MSC config: 8, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 8, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=HR1 S15-S0=0000 + +MSC config: 8, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (5 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=FR3 S15-S0=57ff + codec[3]->type=HR1 + codec[4]->type=HR3 S15-S0=073f + Testing execution completed. -- To view, visit https://gerrit.osmocom.org/10965 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: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Gerrit-Change-Number: 10965 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 18:05:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:05:25 +0000 Subject: Change in osmo-bsc[master]: codec_pref: add AMR configuration bits to make_scl_config() in unit-test In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10963 ) Change subject: codec_pref: add AMR configuration bits to make_scl_config() in unit-test ...................................................................... codec_pref: add AMR configuration bits to make_scl_config() in unit-test The the function make_scl_config() is used to generate realistically looking speech codec lists to perform the unit tests for codec_pref.c. This function does not yet populate the S0-S15 bits for AMR codecs. Lets make sure that at least the default configuration is populated here. Change-Id: I534239416c038ea856c128659f314aa521f85c15 --- M tests/codec_pref/codec_pref_test.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/10963/2 -- To view, visit https://gerrit.osmocom.org/10963 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: I534239416c038ea856c128659f314aa521f85c15 Gerrit-Change-Number: 10963 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 Sep 14 18:05:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:05:25 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix missing breaks in switch-case statement In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10964 ) Change subject: codec_pref: fix missing breaks in switch-case statement ...................................................................... codec_pref: fix missing breaks in switch-case statement In function test_codec_support_bts() the switch case statement lacks break; statements for some cases. This may lead into messed up codec decisions. - Add missing break statements Change-Id: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 --- M src/osmo-bsc/codec_pref.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/10964/2 -- To view, visit https://gerrit.osmocom.org/10964 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: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 Gerrit-Change-Number: 10964 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 Sep 14 18:05:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:05:25 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10965 ) Change subject: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION ...................................................................... codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION The COMPLETE LAYER 3 INFORMATION message lacks the Codec List (BSS Supported) information element. This information element is mandatory for networks that use an IP based user plane (AoIP). - Add function to generate the speech codec list from the current codec settings (Available codecs) - Generate and embed information element in L3 Compl. message Depends: libosmocore I4e656731b16621736c7a2f4e64d9ce63b1064e98 Change-Id: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Related: OS#3548 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c M src/osmo-bsc/gsm_08_08.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 5 files changed, 1,213 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/10965/2 -- To view, visit https://gerrit.osmocom.org/10965 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: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Gerrit-Change-Number: 10965 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 Sep 14 18:12:05 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 14 Sep 2018 18:12:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contain... Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10966 Change subject: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList ...................................................................... MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList Since our BSC implementation is ALL-IP, the COMPLETE LAYER 3 INFORMATION message must contan a Codec List (BSS Supported) information element. The test currently just receive a L3 compl Template and then continue. This is implemented without an altstep. So lets have an altstep with timeout here and make sure that the codecList information element is always included. - Check L3 compl message using an alt-step - Make sure codecList is always included Change-Id: Ia16a454e78421430ec32cc37939d429970cb06ec Related: OS#3548 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/10966/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 9f67f1b..f67117a 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -822,6 +822,7 @@ var BSSMAP_FIELD_CodecType codecType; var boolean sccplite := false; + timer T := 10.0; /* Check if we run on SCCPLITE instead of SCCP by looking if a CIC is * present or not. */ @@ -844,7 +845,24 @@ f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ - BSSAP.receive(tr_BSSMAP_ComplL3); + + var template PDU_BSSAP exp_l3_compl; + exp_l3_compl := tr_BSSMAP_ComplL3() + exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := ?; + T.start; + alt { + [] BSSAP.receive(exp_l3_compl); + [] BSSAP.receive(tr_BSSMAP_ComplL3) { + setverdict(fail, "Received non-matching COMPLETE LAYER 3 INFORMATION"); + all component.stop; + mtc.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); + all component.stop; + mtc.stop; + } + } /* start ciphering, if requested */ if (ispresent(g_pars.encr)) { @@ -858,10 +876,10 @@ var PDU_BSSAP ass_cmd := valueof(ass_tpl); var PDU_BSSAP bssap; - timer T := 10.0; var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete); var boolean exp_fail := ischosen(exp_ass_cpl.pdu.bssmap.assignmentFailure); var boolean exp_modify; + var ExpectCriteria mgcpcrit := { connid := omit, endpoint := omit, -- To view, visit https://gerrit.osmocom.org/10966 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: Ia16a454e78421430ec32cc37939d429970cb06ec Gerrit-Change-Number: 10966 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 14 19:56:37 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:56:37 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9c12826ab16_4c4de8c68c5739dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 110s] No package 'libpcsclite' found [ 110s] simtrace2-remsim.o: In function `main': [ 110s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 110s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 110s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 110s] apdu_dispatch.o: In function `apdu_segment_in': [ 110s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 110s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 110s] collect2: error: ld returned 1 exit status [ 110s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 110s] make[2]: *** [simtrace2-remsim] Error 1 [ 110s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 110s] Makefile:20: recipe for target 'utils' failed [ 110s] make[1]: *** [utils] Error 2 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] dh_auto_build: make -j1 returned exit code 2 [ 110s] debian/rules:4: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 110s] [ 110s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:56:23 UTC 2018. [ 110s] [ 110s] ### VM INTERACTION START ### [ 113s] [ 104.731229] sysrq: SysRq : Power Off [ 113s] [ 104.737575] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:56:26 UTC 2018. [ 113s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:57:11 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:57:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9c12a1c8e_4c4de8c68c5740e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 141s] No package 'libpcsclite' found [ 141s] simtrace2-remsim.o: In function `main': [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 141s] apdu_dispatch.o: In function `apdu_segment_in': [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 141s] collect2: error: ld returned 1 exit status [ 141s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 141s] make[2]: *** [simtrace2-remsim] Error 1 [ 141s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 141s] Makefile:20: recipe for target 'utils' failed [ 141s] make[1]: *** [utils] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] dh_auto_build: make -j1 returned exit code 2 [ 141s] debian/rules:4: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 141s] [ 141s] build31 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:56:57 UTC 2018. [ 141s] [ 141s] ### VM INTERACTION START ### [ 145s] [ 132.987719] sysrq: SysRq : Power Off [ 145s] [ 133.004495] reboot: Power down [ 145s] ### VM INTERACTION END ### [ 145s] [ 145s] build31 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:01 UTC 2018. [ 145s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:57:11 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:57:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9c12a161eb8_4c4de8c68c5741f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 134s] No package 'libpcsclite' found [ 134s] simtrace2-remsim.o: In function `main': [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 134s] apdu_dispatch.o: In function `apdu_segment_in': [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 134s] collect2: error: ld returned 1 exit status [ 134s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 134s] make[2]: *** [simtrace2-remsim] Error 1 [ 134s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 134s] Makefile:20: recipe for target 'utils' failed [ 134s] make[1]: *** [utils] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] dh_auto_build: make -j1 returned exit code 2 [ 134s] debian/rules:4: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] lamb58 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:05 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 127.956983] sysrq: SysRq : Power Off [ 137s] [ 127.963970] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb58 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:09 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:57:45 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:57:45 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9c12bfe25f4_4c4de8c68c5742dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 140s] No package 'libpcsclite' found [ 140s] simtrace2-remsim.o: In function `main': [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 140s] apdu_dispatch.o: In function `apdu_segment_in': [ 140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 140s] collect2: error: ld returned 1 exit status [ 140s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 140s] make[2]: *** [simtrace2-remsim] Error 1 [ 140s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 140s] Makefile:20: recipe for target 'utils' failed [ 140s] make[1]: *** [utils] Error 2 [ 140s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 140s] dh_auto_build: make -j1 returned exit code 2 [ 140s] debian/rules:4: recipe for target 'build' failed [ 140s] make: *** [build] Error 2 [ 140s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 140s] [ 140s] lamb13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:29 UTC 2018. [ 140s] [ 140s] ### VM INTERACTION START ### [ 143s] [ 131.651231] sysrq: SysRq : Power Off [ 143s] [ 131.658457] reboot: Power down [ 143s] ### VM INTERACTION END ### [ 143s] [ 143s] lamb13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:32 UTC 2018. [ 143s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:58:02 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:58:02 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9c12de97ccf_4c4de8c68c5745c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 163s] No package 'libpcsclite' found [ 163s] simtrace2-remsim.o: In function `main': [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 163s] apdu_dispatch.o: In function `apdu_segment_in': [ 163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 163s] collect2: error: ld returned 1 exit status [ 163s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 163s] make[2]: *** [simtrace2-remsim] Error 1 [ 163s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 163s] Makefile:20: recipe for target 'utils' failed [ 163s] make[1]: *** [utils] Error 2 [ 163s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 163s] dh_auto_build: make -j1 returned exit code 2 [ 163s] debian/rules:4: recipe for target 'build' failed [ 163s] make: *** [build] Error 2 [ 163s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 163s] [ 163s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:53 UTC 2018. [ 163s] [ 163s] ### VM INTERACTION START ### [ 166s] [ 155.753039] sysrq: SysRq : Power Off [ 166s] [ 155.762736] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:57 UTC 2018. [ 167s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:58:02 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:58:02 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9c12e225aa7_4c4de8c68c5747f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 177s] No package 'libpcsclite' found [ 177s] simtrace2-remsim.o: In function `main': [ 177s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 177s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 177s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 177s] apdu_dispatch.o: In function `apdu_segment_in': [ 177s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 177s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 177s] collect2: error: ld returned 1 exit status [ 177s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 177s] make[2]: *** [simtrace2-remsim] Error 1 [ 177s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 177s] Makefile:20: recipe for target 'utils' failed [ 177s] make[1]: *** [utils] Error 2 [ 177s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 177s] dh_auto_build: make -j1 returned exit code 2 [ 177s] debian/rules:4: recipe for target 'build' failed [ 177s] make: *** [build] Error 2 [ 177s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 177s] [ 177s] cloud128 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:45 UTC 2018. [ 177s] [ 177s] ### VM INTERACTION START ### [ 180s] [ 159.566898] sysrq: SysRq : Power Off [ 180s] [ 159.571644] reboot: Power down [ 182s] ### VM INTERACTION END ### [ 182s] [ 182s] cloud128 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:51 UTC 2018. [ 182s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:58:19 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:58:19 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9c12e2ce236_4c4de8c68c574972@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 201s] No package 'libpcsclite' found [ 201s] simtrace2-remsim.o: In function `main': [ 201s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 201s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 201s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 201s] apdu_dispatch.o: In function `apdu_segment_in': [ 201s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 201s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 201s] collect2: error: ld returned 1 exit status [ 201s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 201s] make[2]: *** [simtrace2-remsim] Error 1 [ 201s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 201s] Makefile:20: recipe for target 'utils' failed [ 201s] make[1]: *** [utils] Error 2 [ 201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 201s] dh_auto_build: make -j1 returned exit code 2 [ 201s] debian/rules:4: recipe for target 'build' failed [ 201s] make: *** [build] Error 2 [ 201s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 201s] [ 201s] lamb19 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:57 UTC 2018. [ 201s] [ 201s] ### VM INTERACTION START ### [ 204s] [ 191.779075] sysrq: SysRq : Power Off [ 204s] [ 191.786846] reboot: Power down [ 204s] ### VM INTERACTION END ### [ 204s] [ 204s] lamb19 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:58:02 UTC 2018. [ 204s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 19:58:02 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 19:58:02 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9c12e26ed00_4c4de8c68c5748f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 137s] No package 'libpcsclite' found [ 137s] simtrace2-remsim.o: In function `main': [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 137s] apdu_dispatch.o: In function `apdu_segment_in': [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 137s] collect2: error: ld returned 1 exit status [ 137s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 137s] make[2]: *** [simtrace2-remsim] Error 1 [ 137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 137s] Makefile:20: recipe for target 'utils' failed [ 137s] make[1]: *** [utils] Error 2 [ 137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 137s] dh_auto_build: make -j1 returned exit code 2 [ 137s] debian/rules:4: recipe for target 'build' failed [ 137s] make: *** [build] Error 2 [ 137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 137s] [ 137s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:49 UTC 2018. [ 137s] [ 137s] ### VM INTERACTION START ### [ 141s] [ 130.913077] sysrq: SysRq : Power Off [ 141s] [ 130.917259] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 141s] [ 141s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 19:57:53 UTC 2018. [ 141s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 14 20:07:27 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Sep 2018 20:07:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9c1517cc71a_4c4de8c68c575124@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 298s] No package 'libpcsclite' found [ 298s] simtrace2-remsim.o: In function `main': [ 298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 298s] apdu_dispatch.o: In function `apdu_segment_in': [ 298s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 298s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 298s] collect2: error: ld returned 1 exit status [ 298s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 298s] make[2]: *** [simtrace2-remsim] Error 1 [ 298s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 298s] Makefile:20: recipe for target 'utils' failed [ 298s] make[1]: *** [utils] Error 2 [ 298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 298s] dh_auto_build: make -j1 returned exit code 2 [ 298s] debian/rules:4: recipe for target 'build' failed [ 298s] make: *** [build] Error 2 [ 298s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 298s] [ 298s] armbuild04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 20:07:10 UTC 2018. [ 298s] [ 298s] ### VM INTERACTION START ### [ 301s] [ 279.555574] SysRq : Power Off [ 301s] [ 279.557070] reboot: Power down [ 301s] ### VM INTERACTION END ### [ 301s] [ 301s] armbuild04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 14 20:07:13 UTC 2018. [ 301s] -- 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 Sep 14 21:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Sep 2018 21:55:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contain... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10966 ) Change subject: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList ...................................................................... Patch Set 1: I think this should only apply if not sccplite! -- To view, visit https://gerrit.osmocom.org/10966 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: Ia16a454e78421430ec32cc37939d429970cb06ec Gerrit-Change-Number: 10966 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 14 Sep 2018 21:55:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 14 22:00:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Sep 2018 22:00:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10769 ) Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 14 Sep 2018 22:00: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 Sep 14 22:00:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Sep 2018 22:00:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: implement TC_attach_usim_resync In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10769 ) Change subject: sgsn: implement TC_attach_usim_resync ...................................................................... sgsn: implement TC_attach_usim_resync Test the UMTS AKA resync procedure with USIMs. MS -> SGSN: Attach Request MS <- SGSN: Identity Request IMSI MS -> SGSN: Identity Response IMSI MS <- SGSN: Identity Request IMEI MS -> SGSN: Identity Response IMEI HLR<- SGSN: SAI Request HLR-> SGSN: SAI Response MS <- SGSN: Auth Request MS -> SGSN: Auth Failure (with AUTS) HLR<- SGSN: SAI Request (with AUTS & RAND) HLR-> SGSN: SAI Response (new key material) MS <- SGSN: Auth Request (new key material) MS -> SGSN: Auth Response MS <- SGSN: Attach Accept MS -> SGSN: Attach Complete Change-Id: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d --- M sgsn/SGSN_Tests.ttcn 1 file changed, 131 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 0112483..a2e93c0 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2015,6 +2015,136 @@ vc_conn.done; } +private function f_TC_attach_usim_resync(charstring id) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + var RoutingAreaIdentificationV old_ra := f_random_RAI(); + + var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); + + /* send Attach Request */ + /* indicate R99 capability of the MS to enable UMTS AKA in presence of + * 3G auth vectors */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.revisionLevelIndicatior := '1'B; + /* The thing is, if the solSACapability is 'omit', then the + * revisionLevelIndicatior is at the wrong place! */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; + f_send_l3_gmm_llc(attach_req); + + /* do the auth */ + var PDU_L3_MS_SGSN l3_mo; + var PDU_L3_SGSN_MS l3_mt; + var default di := activate(as_mm_identity()); + + var GSUP_IE auth_tuple; + var template AuthenticationParameterAUTNTLV autn; + + g_pars.vec := f_gen_auth_vec_3g(); + autn := { + elementIdentifier := '28'O, + lengthIndicator := lengthof(g_pars.vec.autn), + autnValue := g_pars.vec.autn + }; + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + log("GSUP sends 2G and 3G auth tuples", auth_tuple); + GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + + var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); + auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; + BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + + /* send the gmm auth failure with resync IE */ + f_send_l3_gmm_llc(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts)); + + /* wait for the GSUP resync request */ + GSUP.receive(tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC( + g_pars.imsi, + g_pars.vec.auts, + g_pars.vec.rand)); + + /* generate new key material */ + g_pars.vec := f_gen_auth_vec_3g(); + autn := { + elementIdentifier := '28'O, + lengthIndicator := lengthof(g_pars.vec.autn), + autnValue := g_pars.vec.autn + }; + + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + /* send new key material */ + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + + /* wait for the new Auth Request */ + auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); + auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; + BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + l3_mt := bd.l3_mt; + var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; + var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationParResp := { + valueField := substr(g_pars.vec.res, 0, 4) + }; + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationRespParExt := { + elementIdentifier := '21'O, + lengthIndicator := lengthof(g_pars.vec.res) - 4, + valueField := substr(g_pars.vec.res, 4, lengthof(g_pars.vec.res) - 4) + }; + l3_mo := valueof(auth_ciph_resp); + if (ispresent(l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest) and + l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest.valueField == '001'B) { + l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := + valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); + } + f_send_l3_gmm_llc(l3_mo); + deactivate(di); + + /* Expect SGSN to perform LU with HLR */ + f_gmm_gsup_lu_isd(); + + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + } + f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + setverdict(pass); +} + +testcase TC_attach_usim_resync() runs on test_CT { + /* MS -> SGSN: Attach Request + * MS <- SGSN: Identity Request IMSI + * MS -> SGSN: Identity Response IMSI + * MS <- SGSN: Identity Request IMEI + * MS -> SGSN: Identity Response IMEI + * HLR<- SGSN: SAI Request + * HLR-> SGSN: SAI Response + * MS <- SGSN: Auth Request + * MS -> SGSN: Auth Failure (with AUTS) + * HLR<- SGSN: SAI Request (with AUTS & RAND) + * HLR-> SGSN: SAI Response (new key material) + * MS <- SGSN: Auth Request (new key material) + * MS -> SGSN: Auth Response + * MS <- SGSN: Attach Accept + * MS -> SGSN: Attach Complete + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_usim_resync), testcasename(), g_gb, 40); + vc_conn.done; +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -2042,6 +2172,7 @@ execute( TC_attach_rau() ); execute( TC_attach_rau_a_a() ); execute( TC_attach_rau_a_b() ); + execute( TC_attach_usim_resync() ); execute( TC_detach_unknown_nopoweroff() ); execute( TC_detach_unknown_poweroff() ); execute( TC_detach_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/10769 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: I52a8dc45bb67d4ca9f3efade278d3308bb0da73d Gerrit-Change-Number: 10769 Gerrit-PatchSet: 3 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 Sat Sep 15 07:46:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:46:54 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler.h: share FRAME_DURATION_uS definition In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10945 ) Change subject: trxcon/scheduler.h: share FRAME_DURATION_uS definition ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10945 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: I88be6088141af6bac8d34844b71193bfef51ad31 Gerrit-Change-Number: 10945 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:46:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 07:46:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:46:56 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler.h: share FRAME_DURATION_uS definition In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10945 ) Change subject: trxcon/scheduler.h: share FRAME_DURATION_uS definition ...................................................................... trxcon/scheduler.h: share FRAME_DURATION_uS definition Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31 --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 3 files changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 1e88f8b..a8a1289 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -337,10 +337,10 @@ trx_if_cmd_poweron(l1l->trx); /* Start FBSB expire timer */ - /* TODO: share FRAME_DURATION_uS=4615 from scheduler.c */ l1l->fbsb_timer.data = l1l; l1l->fbsb_timer.cb = fbsb_timer_cb; - osmo_timer_schedule(&l1l->fbsb_timer, 0, timeout * 4615); + osmo_timer_schedule(&l1l->fbsb_timer, 0, + timeout * FRAME_DURATION_uS); exit: msgb_free(msg); diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 56b89a2..dab9578 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -43,7 +43,6 @@ #include "trx_if.h" #include "trxcon.h" -#define FRAME_DURATION_uS 4615 #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index 6c3a2f2..ddb863f 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -5,6 +5,8 @@ #include +#define FRAME_DURATION_uS 4615 + #define GSM_SUPERFRAME (26 * 51) #define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME) -- To view, visit https://gerrit.osmocom.org/10945 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: I88be6088141af6bac8d34844b71193bfef51ad31 Gerrit-Change-Number: 10945 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 15 07:50:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:50:42 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10941 ) Change subject: trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10941 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: Ie39d53522cafab265099076b3194fa96aff217ba Gerrit-Change-Number: 10941 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:50: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 Sep 15 07:51:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:51:47 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TDMA frame math helpers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10942 ) Change subject: trxcon/scheduler: introduce TDMA frame math helpers ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10942/1/src/host/trxcon/scheduler.h File src/host/trxcon/scheduler.h: https://gerrit.osmocom.org/#/c/10942/1/src/host/trxcon/scheduler.h at 14 PS1, Line 14: #define TDMA_FN_SUM(a, b) \ you could implement TDMA_FN_INC(fn) as TDMA_FN_SUM(fn, 1) -- To view, visit https://gerrit.osmocom.org/10942 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: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 Gerrit-Change-Number: 10942 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:51:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 07:51:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:51:53 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10941 ) Change subject: trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode ...................................................................... trxcon/scheduler: fix: don't send BFI in GSM48_CMODE_SIGN mode GSM48_CMODE_SIGN means 'signaling only', so we shall not send bad frame indications in this state. Instead, it makes sense to send dummy L2 frames like we do for xCCH channels. Change-Id: Ie39d53522cafab265099076b3194fa96aff217ba --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_tchf.c 2 files changed, 11 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 2767b90..95e496b 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -145,7 +145,6 @@ size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan) { switch (lchan->tch_mode) { - case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: if (lchan->type == TRXC_TCHF) { /* Full Rate */ memset(l2, 0x00, GSM_FR_BYTES); @@ -163,6 +162,9 @@ case GSM48_CMODE_SPEECH_AMR: /* Adaptive Multi Rate */ /* FIXME: AMR is not implemented yet */ return 0; + case GSM48_CMODE_SIGN: + LOGP(DSCH, LOGL_ERROR, "BFI is not allowed in signalling mode\n"); + return 0; default: 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 f6465f9..09d504f 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -151,13 +151,18 @@ 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; + /* BFI is not applicable in signalling mode */ + if (lchan->tch_mode == GSM48_CMODE_SIGN) + return sched_send_dt_ind(trx, ts, lchan, NULL, 0, + n_errors, true, false); + + /* Bad frame indication */ + l2_len = sched_bad_frame_ind(l2, lchan); + /* Send a BFI frame to the higher layers */ return sched_send_dt_ind(trx, ts, lchan, l2, l2_len, n_errors, true, true); -- To view, visit https://gerrit.osmocom.org/10941 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: Ie39d53522cafab265099076b3194fa96aff217ba Gerrit-Change-Number: 10941 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 15 07:54:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:54:55 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix missing breaks in switch-case statement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10964 ) Change subject: codec_pref: fix missing breaks in switch-case statement ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10964 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: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 Gerrit-Change-Number: 10964 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:54: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 Sep 15 07:55:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:55:17 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix typo in comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10962 ) Change subject: codec_pref: fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10962 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: Ie4ea8179395cd331dad4b62227debb026b5b008c Gerrit-Change-Number: 10962 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:55:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 07:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:55:43 +0000 Subject: Change in osmo-bsc[master]: codec_pref: add AMR configuration bits to make_scl_config() in unit-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10963 ) Change subject: codec_pref: add AMR configuration bits to make_scl_config() in unit-test ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10963 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: I534239416c038ea856c128659f314aa521f85c15 Gerrit-Change-Number: 10963 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:55:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 07:56:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:56:06 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix missing breaks in switch-case statement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10964 ) Change subject: codec_pref: fix missing breaks in switch-case statement ...................................................................... codec_pref: fix missing breaks in switch-case statement In function test_codec_support_bts() the switch case statement lacks break; statements for some cases. This may lead into messed up codec decisions. - Add missing break statements Change-Id: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 --- M src/osmo-bsc/codec_pref.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 96c2c38..924f77f 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -148,15 +148,19 @@ case GSM0808_PERM_FR2: if (bts_codec->efr) return true; + break; case GSM0808_PERM_FR3: if (bts_codec->amr) return true; + break; case GSM0808_PERM_HR1: if (bts_codec->hr) return true; + break; case GSM0808_PERM_HR3: if (bts_codec->amr) return true; + break; default: return false; } -- To view, visit https://gerrit.osmocom.org/10964 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: Ib5400a0a0a8a39fa714bd087df345160bed5cc61 Gerrit-Change-Number: 10964 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 Sat Sep 15 07:56:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:56:04 +0000 Subject: Change in osmo-bsc[master]: codec_pref: fix typo in comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10962 ) Change subject: codec_pref: fix typo in comment ...................................................................... codec_pref: fix typo in comment Change-Id: Ie4ea8179395cd331dad4b62227debb026b5b008c --- M src/osmo-bsc/codec_pref.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/codec_pref.c b/src/osmo-bsc/codec_pref.c index 2a9be6e..96c2c38 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -167,7 +167,7 @@ /*! Match the codec preferences from local config with a received codec preferences IEs received from the * MSC and the BTS' codec configuration. * \param[out] chan_mode GSM 04.08 channel mode. - * \param[out] full_rate true iff full-rate. + * \param[out] full_rate true if full-rate. * \param[in] ct GSM 08.08 channel type received from MSC. * \param[in] scl GSM 08.08 speech codec list received from MSC (optional). * \param[in] audio_support List of allowed codecs as from local config. -- To view, visit https://gerrit.osmocom.org/10962 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: Ie4ea8179395cd331dad4b62227debb026b5b008c Gerrit-Change-Number: 10962 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 Sat Sep 15 07:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:56:05 +0000 Subject: Change in osmo-bsc[master]: codec_pref: add AMR configuration bits to make_scl_config() in unit-test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10963 ) Change subject: codec_pref: add AMR configuration bits to make_scl_config() in unit-test ...................................................................... codec_pref: add AMR configuration bits to make_scl_config() in unit-test The the function make_scl_config() is used to generate realistically looking speech codec lists to perform the unit tests for codec_pref.c. This function does not yet populate the S0-S15 bits for AMR codecs. Lets make sure that at least the default configuration is populated here. Change-Id: I534239416c038ea856c128659f314aa521f85c15 --- M tests/codec_pref/codec_pref_test.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index b0b9f5e..efc77f6 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -78,11 +78,13 @@ case 3: /* FR3 only */ scl->codec[0].type = GSM0808_SCT_FR3; + scl->codec[0].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; scl->len = 1; break; case 4: /* HR3 only */ scl->codec[0].type = GSM0808_SCT_HR3; + scl->codec[0].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; scl->len = 1; break; case 5: @@ -102,7 +104,9 @@ /* FR1, FR3 and HR3 */ scl->codec[0].type = GSM0808_SCT_FR1; scl->codec[1].type = GSM0808_SCT_FR3; + scl->codec[1].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; scl->codec[2].type = GSM0808_SCT_HR3; + scl->codec[2].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; scl->len = 3; break; case 8: @@ -110,8 +114,10 @@ scl->codec[0].type = GSM0808_SCT_FR1; scl->codec[1].type = GSM0808_SCT_FR2; scl->codec[2].type = GSM0808_SCT_FR3; + scl->codec[2].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; scl->codec[3].type = GSM0808_SCT_HR1; scl->codec[4].type = GSM0808_SCT_HR3; + scl->codec[4].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; scl->len = 5; break; } -- To view, visit https://gerrit.osmocom.org/10963 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: I534239416c038ea856c128659f314aa521f85c15 Gerrit-Change-Number: 10963 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 Sat Sep 15 07:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:56:36 +0000 Subject: Change in libosmocore[master]: gsm0808: fix wrong codec defaults for OFR_AMR_WB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10960 ) Change subject: gsm0808: fix wrong codec defaults for OFR_AMR_WB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10960 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: I4a481def59e9c98cfdcafc2b80c0ac7df0c14130 Gerrit-Change-Number: 10960 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:56:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 07:57:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:57:19 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10961 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10961 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: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Gerrit-Change-Number: 10961 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 07:57:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 07:57:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:57:21 +0000 Subject: Change in libosmocore[master]: gsm0808: fix wrong codec defaults for OFR_AMR_WB In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10960 ) Change subject: gsm0808: fix wrong codec defaults for OFR_AMR_WB ...................................................................... gsm0808: fix wrong codec defaults for OFR_AMR_WB 3GPP TS 48.008 chapter 3.2.2.103 states that the configuration bits of OFR_AMR_WB are coded as follows: "S0, S2, S4 indicates the supported Codec Configurations. S1, S3, S5, S6, S7 are reserved and coded with zeroes." The current default setting of 0x3F violates this requirement. Lets set the "forbidden" settings zu zero and keep only the allowed ones. Change-Id: I4a481def59e9c98cfdcafc2b80c0ac7df0c14130 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 69007b5..9433817 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -499,7 +499,7 @@ GSM0808_SC_CFG_DEFAULT_HR_AMR = 0x073f, GSM0808_SC_CFG_DEFAULT_OHR_AMR = 0x57ff, GSM0808_SC_CFG_DEFAULT_FR_AMR_WB = 0x01, - GSM0808_SC_CFG_DEFAULT_OFR_AMR_WB = 0x3f, + GSM0808_SC_CFG_DEFAULT_OFR_AMR_WB = 0x15, GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; -- To view, visit https://gerrit.osmocom.org/10960 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: I4a481def59e9c98cfdcafc2b80c0ac7df0c14130 Gerrit-Change-Number: 10960 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 Sat Sep 15 07:57:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 07:57:21 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10961 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... gsm0808: add function to convert amr gsm0408 setings to gsm0808 Add a function to convert struct gsm48_multi_rate_conf, which holds the codec settings for AMR, to S0-S15 bit representation as defined in 3GPP TS 48.008 3.2.2.49 Change-Id: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 480 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 242bce9..0a7429e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,6 +104,7 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 9433817..8431ace 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -503,6 +503,20 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; +/*! Default speech codec configurations broken down by reate. + * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for + * the Adaptive Multi-Rate Codec Types. */ +enum gsm0808_speech_codec_rate_defaults { + GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, + GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, + GSM0808_SC_CFG_DEFAULT_AMR_5_90 = 0xff06, + GSM0808_SC_CFG_DEFAULT_AMR_6_70 = 0x3e08, + GSM0808_SC_CFG_DEFAULT_AMR_7_40 = 0x0c12, + GSM0808_SC_CFG_DEFAULT_AMR_7_95 = 0xc020, + GSM0808_SC_CFG_DEFAULT_AMR_10_2 = 0x3040, + GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 +}; + /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 73f0234..4b2a5f5 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1161,6 +1161,49 @@ return 0; } +/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a + * given GSM 04.08 AMR configuration struct. + * \param[in] cfg AMR configuration in GSM 04.08 format. + * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. + * \returns configuration bits (S0-S15) */ +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, + bool fr) +{ + uint16_t s15_s0 = 0; + + /* Check each rate bit in the AMR multirate configuration and pick the + * matching default configuration as specified in 3GPP TS 28.062, + * Table 7.11.3.1.3-2. */ + if (cfg->m4_75) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_4_75; + if (cfg->m5_15) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_15; + if (cfg->m5_90) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_90; + if (cfg->m6_70) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_6_70; + if (cfg->m7_40) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_40; + if (cfg->m7_95) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_95; + if (cfg->m10_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_10_2; + if (cfg->m12_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_12_2; + + /* Note: 3GPP TS 48.008, chapter 3GPP TS 48.008 states that for AMR + * some of the configuration bits must be coded as zeros. The applied + * bitmask matches the default codec settings. See also the definition + * of enum gsm0808_speech_codec_defaults in gsm_08_08.h and + * 3GPP TS 28.062, Table 7.11.3.1.3-2. */ + if (fr) + s15_s0 &= GSM0808_SC_CFG_DEFAULT_FR_AMR; + else + s15_s0 &= GSM0808_SC_CFG_DEFAULT_HR_AMR; + + return s15_s0; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 0c40c88..3d08232 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -205,6 +205,7 @@ gsm0808_cell_id_u_name; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; +gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index ae138be..29cecb2 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1444,6 +1444,200 @@ msgb_free(msg); } +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) +{ + uint16_t s15_s0; + + printf("Input:\n"); + printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); + printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); + printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); + printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); + printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); + printf(" m7_95= %u\n", cfg->m7_95); + printf(" m10_2= %u\n", cfg->m10_2); + printf(" m12_2= %u\n", cfg->m12_2); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); + printf("Result (fr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); + printf("Result (hr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + printf("\n"); +} + +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg(void) +{ + struct gsm48_multi_rate_conf cfg; + + printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1495,6 +1689,8 @@ test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); + test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); + printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 6cd7982..dc1deba 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -74,4 +74,229 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) +Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5703 = 0b0101011100000011 +Result (hr): + S15-S0 = 0703 = 0b0000011100000011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5706 = 0b0101011100000110 +Result (hr): + S15-S0 = 0706 = 0b0000011100000110 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 1608 = 0b0001011000001000 +Result (hr): + S15-S0 = 0608 = 0b0000011000001000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0412 = 0b0000010000010010 +Result (hr): + S15-S0 = 0412 = 0b0000010000010010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 4020 = 0b0100000000100000 +Result (hr): + S15-S0 = 0020 = 0b0000000000100000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 1040 = 0b0001000001000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 4082 = 0b0100000010000010 +Result (hr): + S15-S0 = 0002 = 0b0000000000000010 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 570f = 0b0101011100001111 +Result (hr): + S15-S0 = 070f = 0b0000011100001111 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 54f2 = 0b0101010011110010 +Result (hr): + S15-S0 = 0432 = 0b0000010000110010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ce = 0b0101011111001110 +Result (hr): + S15-S0 = 070e = 0b0000011100001110 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5733 = 0b0101011100110011 +Result (hr): + S15-S0 = 0733 = 0b0000011100110011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 56aa = 0b0101011010101010 +Result (hr): + S15-S0 = 062a = 0b0000011000101010 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 5757 = 0b0101011101010111 +Result (hr): + S15-S0 = 0717 = 0b0000011100010111 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ff = 0b0101011111111111 +Result (hr): + S15-S0 = 073f = 0b0000011100111111 + Done -- To view, visit https://gerrit.osmocom.org/10961 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: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Gerrit-Change-Number: 10961 Gerrit-PatchSet: 1 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 Sat Sep 15 08:00:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 15 Sep 2018 08:00:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmocore_=C2=BB_a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,amd64,osmocom-master-debian9_#475?= Message-ID: <1012601881.125.1536998454297.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [pmaier at sysmocom.de] gsm0808: fix wrong codec defaults for OFR_AMR_WB [pmaier at sysmocom.de] gsm0808: add function to convert amr gsm0408 setings to gsm0808 ------------------------------------------ [...truncated 519.47 KB...] ## -------------------------------------- ## ## libosmocore 0.12.0.57-2fd4 test suite. ## ## -------------------------------------- ## Regression tests. 1: a5 ok 2: abis ok 3: ctrl ok 4: kasumi ok 5: bits ok 6: bitvec ok 7: bitcomp ok 8: bitfield ok 9: conv ok 10: conv_gsm0503 ok 11: coding ok 12: msgb ok 13: gea ok 14: msgfile ok 15: sms ok 16: smscb ok 17: ussd ok 18: auth ok 19: comp128 ok 20: lapd ok 21: gsm0808 FAILED (testsuite.at:132) 22: gsm0408 ok 23: gprs ok 24: logging ok 25: codec ok 26: codec_ecu_fr ok 27: fr ok 28: loggingrb ok 29: strrb ok 30: vty ok 31: gprs-bssgp ok 32: gprs-ns ok 33: utils ok 34: stats ok 35: write_queue ok 36: bssgp-fc ok 37: sim ok 38: timer ok 39: clk_override ok 40: tlv ok 41: gsup ok 42: fsm ok 43: oap ok 44: oap_client ok 45: socket ok 46: osmo-auc-gen ok 47: endian ok 48: sercomm ok 49: prbs ok 50: gsm23003 ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 50 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [libosmocore 0.12.0.57-2fd4] testsuite: 21 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1997: recipe for target 'check-local' failed make[4]: *** [check-local] Error 1 make[4]: Leaving directory ' Makefile:1766: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:1769: recipe for target 'check' failed make[2]: *** [check] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:905: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh ======================== ./tests/testsuite.dir/21/testsuite.log # -*- compilation -*- 21. testsuite.at:129: testing gsm0808 ... :132: $abs_top_builddir/tests/gsm0808/gsm0808_test stderr: --- expout 2018-09-15 08:00:50.208137271 +0000 +++ 2018-09-15 08:00:50.236136890 +0000 @@ -80,7 +80,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -94,7 +94,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -108,7 +108,7 @@ m5_15= 1 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -122,7 +122,7 @@ m5_15= 0 spare= 0 m5_90= 1 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -136,7 +136,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -150,7 +150,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -164,7 +164,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 1 m10_2= 0 m12_2= 0 @@ -178,7 +178,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 1 m12_2= 0 @@ -192,7 +192,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 1 @@ -206,7 +206,7 @@ m5_15= 1 spare= 0 m5_90= 1 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -220,7 +220,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 1 m10_2= 1 m12_2= 1 @@ -234,7 +234,7 @@ m5_15= 0 spare= 0 m5_90= 1 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 1 m12_2= 1 @@ -248,7 +248,7 @@ m5_15= 1 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 1 m10_2= 0 m12_2= 0 @@ -262,7 +262,7 @@ m5_15= 1 spare= 0 m5_90= 0 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 1 m10_2= 0 m12_2= 1 @@ -276,7 +276,7 @@ m5_15= 0 spare= 0 m5_90= 1 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 0 m10_2= 1 m12_2= 0 @@ -290,7 +290,7 @@ m5_15= 1 spare= 0 m5_90= 1 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 1 m10_2= 1 m12_2= 1 21. testsuite.at:129: 21. gsm0808 (testsuite.at:129): FAILED (testsuite.at:132) 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 Sep 15 08:00:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:00:56 +0000 Subject: Change in meta-telephony[laforge/nightly]: libosmo-sccp: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10948 ) Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 10948 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:00:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:02 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-iuh: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10949 ) Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 10949 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:08 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10950 ) Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 10950 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:21 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10951 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 10951 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:28 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10952 ) Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 10952 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:37 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sgsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10953 ) Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 10953 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:43 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10954 ) Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 10954 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:01:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:49 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10955 ) Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 10955 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01: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 Sep 15 08:01:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:01:56 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10956 ) Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 10956 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:02:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:05 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10957 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 10957 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:02:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:02:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:18 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10958 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 10958 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:02:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:02:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:25 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10959 ) Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 10959 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:02:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:02:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:26 +0000 Subject: Change in meta-telephony[laforge/nightly]: libosmo-sccp: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10948 ) Change subject: libosmo-sccp: handle systemd and cfg files through autotools ...................................................................... libosmo-sccp: handle systemd and cfg files through autotools Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c --- M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc 1 file changed, 6 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 60793e3..78dd525 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,12 +3,17 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools pkgconfig systemd +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + # we require the tests to link to the static libosmo-sigtran library to # access symbols not starting with osmo_* EXTRA_OECONF_remove = "--disable-static" @@ -17,14 +22,6 @@ SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ -} - FILES_osmo-stp = " \ ${bindir}/osmo-stp \ ${sysconfdir}/osmocom/osmo-stp.cfg \ -- To view, visit https://gerrit.osmocom.org/10948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c Gerrit-Change-Number: 10948 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 Sat Sep 15 08:02:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:26 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-iuh: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10949 ) Change subject: osmo-iuh: handle systemd and cfg files through autotools ...................................................................... osmo-iuh: handle systemd and cfg files through autotools Change-Id: If879153a32ae21ad63284382a420da534f30e6eb --- M recipes-osmocom/osmo-iuh/osmo-iuh.inc 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 6dfb344..ab412ad 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hnbgw.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hnbgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" SYSTEMD_PACKAGES = "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/10949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb Gerrit-Change-Number: 10949 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 Sat Sep 15 08:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:27 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-hlr: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10950 ) Change subject: osmo-hlr: handle systemd and cfg files through autotools ...................................................................... osmo-hlr: handle systemd and cfg files through autotools Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce --- M recipes-osmocom/osmo-hlr/osmo-hlr.inc 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 8f078ed..13c01f7 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,15 +14,15 @@ } do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ install -d ${D}${localstatedir}/lib/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-hlr.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils" FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/10950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce Gerrit-Change-Number: 10950 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 Sat Sep 15 08:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:27 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10951 ) Change subject: osmo-ggsn: Drop untested sysvinit support ...................................................................... osmo-ggsn: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 --- D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 3 files changed, 3 insertions(+), 179 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init deleted file mode 100755 index 157d6dd..0000000 --- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-ggsn -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Osmocom GSM network-in-a-box -# Description: A minimal implementation of the GSM Base Station Controller, -# Mobile Switching Center, Home Location regster and all other -# components to run a self-contained GSM network. -### END INIT INFO - -# Author: Harald Welte - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Osmocom GGSN implementation" -NAME=osmo-ggsn -DAEMON=/usr/bin/ggsn -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CONFIG_FILE=/etc/ggsn.conf - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -# . /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -# . /lib/lsb/init-functions - -DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - /sbin/modprobe tun - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - - # Check for runtime directory of nonvolatile data - if [ ! -d /var/lib/ggsn ]; then - mkdir /var/lib/ggsn - fi - - # Check for GTP restart counter - if [ ! -f /var/lib/ggsn/gsn_restart ]; then - echo 0 > /var/lib/ggsn/gsn_restart - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - #[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - # esac - ;; - stop) - #[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - #case "$?" in - # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - #esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - #log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - #case "$?" in - # 0) log_end_msg 0 ;; - # 1) log_end_msg 1 ;; # Old process is still running - # *) log_end_msg 1 ;; # Failed to start - #esac - ;; - *) - # Failed to stop - #log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index 49dd1ee..fe0170f 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,30 +5,24 @@ DEPENDS = "libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools update-rc.d pkgconfig systemd +inherit autotools pkgconfig systemd do_install_append() { - install -d ${D}${sysconfdir}/init.d install -d ${D}${systemd_system_unitdir}/ install -d ${D}/${sysconfdir}/osmocom/ - install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ } SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" -INITSCRIPT_PACKAGES = "osmo-ggsn" -INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" -INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" - CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" FILES_libgtp = "${libdir}/*${SOLIBS}" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index a12925d..da46975 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -3,8 +3,7 @@ S = "${WORKDIR}/git" SRCREV = "${AUTOREV}" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ - file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ " PV = "1.2.2+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -- To view, visit https://gerrit.osmocom.org/10951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 10951 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 Sat Sep 15 08:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:27 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-ggsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10952 ) Change subject: osmo-ggsn: handle systemd and cfg files through autotools ...................................................................... osmo-ggsn: handle systemd and cfg files through autotools Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a --- M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc 1 file changed, 8 insertions(+), 11 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index fe0170f..0aaf418 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,22 +5,19 @@ DEPENDS = "libosmocore" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" -inherit autotools pkgconfig systemd - -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}/${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ -} - SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" -- To view, visit https://gerrit.osmocom.org/10952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a Gerrit-Change-Number: 10952 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 Sat Sep 15 08:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:28 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sgsn: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10953 ) Change subject: osmo-sgsn: handle systemd and cfg files through autotools ...................................................................... osmo-sgsn: handle systemd and cfg files through autotools At the same time systemd services were installed by autotools, osmo-gtphub service became available too. Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 --- M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 1 file changed, 8 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 4711a2c..45256a5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,29 +5,22 @@ DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-gtphub/osmo-gtphub.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-gbproxy.service ${D}${systemd_system_unitdir}/ -} - PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" +SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -- To view, visit https://gerrit.osmocom.org/10953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852 Gerrit-Change-Number: 10953 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 Sat Sep 15 08:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:28 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-mgw: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10954 ) Change subject: osmo-mgw: handle systemd and cfg files through autotools ...................................................................... osmo-mgw: handle systemd and cfg files through autotools Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 --- M recipes-osmocom/osmo-mgw/osmo-mgw.inc 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index 19e17ab..c00f998 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,17 +5,14 @@ DEPENDS = "libosmocore libosmo-netif" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg ${D}${sysconfdir}/osmocom/osmo-mgw.cfg - install -m 0644 ${S}/contrib/systemd/osmo-mgw.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" -- To view, visit https://gerrit.osmocom.org/10954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11 Gerrit-Change-Number: 10954 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 Sat Sep 15 08:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:28 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-msc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10955 ) Change subject: osmo-msc: handle systemd and cfg files through autotools ...................................................................... osmo-msc: handle systemd and cfg files through autotools Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a --- M recipes-osmocom/osmo-msc/osmo-msc.inc 1 file changed, 7 insertions(+), 10 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index e5364cd..59280ce 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,23 +5,20 @@ DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -PACKAGECONFIG ??= "smpp ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}" +PACKAGECONFIG ??= "\ + smpp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh," PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34," RDEPENDS_${PN} = "libdbd-sqlite3" -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_system_unitdir}/ -} - SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg" -- To view, visit https://gerrit.osmocom.org/10955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a Gerrit-Change-Number: 10955 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 Sat Sep 15 08:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:28 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10956 ) Change subject: osmo-bsc: handle systemd and cfg files through autotools ...................................................................... osmo-bsc: handle systemd and cfg files through autotools Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 --- M recipes-osmocom/osmo-bsc/osmo-bsc.inc 1 file changed, 5 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index d066a58..484a779 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,18 +5,14 @@ DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/ -} +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" -- To view, visit https://gerrit.osmocom.org/10956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0 Gerrit-Change-Number: 10956 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 Sat Sep 15 08:02:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:29 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-sip-connector: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10957 ) Change subject: osmo-sip-connector: handle systemd and cfg files through autotools ...................................................................... osmo-sip-connector: handle systemd and cfg files through autotools Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 --- M recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc index d7f22a3..96d3734 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc @@ -5,17 +5,15 @@ DEPENDS = "sofia-sip libosmocore" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" - install -m 0644 ${S}/doc/examples/osmo-sip-connector.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-sip-connector.service ${D}${systemd_system_unitdir}/ -} SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg" -- To view, visit https://gerrit.osmocom.org/10957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 Gerrit-Change-Number: 10957 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 Sat Sep 15 08:02:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:29 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: Drop untested sysvinit support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10958 ) Change subject: openbsc: Drop untested sysvinit support ...................................................................... openbsc: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. As update-rc.d was removed, it was noticied that systemd class inherit was missing, so this commit adds it. As a result, it's not required to define systemd service file paths in FILES_*. Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 --- M recipes-osmocom/openbsc/openbsc.inc D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init D recipes-osmocom/openbsc/openbsc/osmo-nitb.init M recipes-osmocom/openbsc/openbsc_git.bb 4 files changed, 2 insertions(+), 119 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ec130db..ca3b124 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,15 +6,11 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -SRC_URI = "file://osmo-nitb.init \ - file://osmo-bsc-sccplite.init \ - " - INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" -inherit autotools update-rc.d pkgconfig +inherit autotools systemd pkgconfig do_install_append() { install -d ${D}${sysconfdir}/osmocom @@ -23,12 +19,6 @@ install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - # Install sysv-init files - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rc5.d - install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb - install -m 0775 ${WORKDIR}/osmo-bsc-sccplite.init ${D}${sysconfdir}/init.d/osmo-bsc-sccplite - # Install systemd files and enable on sysinit install -d ${D}${systemd_system_unitdir}/ install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ @@ -42,27 +32,18 @@ PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" -INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" -INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ ${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg \ - ${sysconfdir}/init.d/osmo-bsc-sccplite \ - ${systemd_system_unitdir}/osmo-bsc-sccplite.service \ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" -INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" -INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ - ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" @@ -70,7 +51,6 @@ FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - ${systemd_system_unitdir}/osmo-bsc-nat.service \ " CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" @@ -78,5 +58,4 @@ FILES_osmo-bsc-mgcp = " \ ${bindir}/osmo-bsc_mgcp \ ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${systemd_system_unitdir}/osmo-bsc-mgcp.service \ " diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init deleted file mode 100755 index 3186f6d..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-bsc-sccplite -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Base Station Controller (legacy, with SCCPLite) -### END INIT INFO - -DAEMON=/usr/bin/osmo-bsc-sccplite -NAME=osmo-bsc-sccplite -DESC="Osmocom GSM Base Station Controller" -NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-sccplite.cfg -r /var/run/openbsc.ctl" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-bsc-sccplite || . /etc/default/osmo-bsc-sccplite -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init deleted file mode 100755 index bd74cc0..0000000 --- a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-nitb -# Required-Start: $syslog $networking -# Required-Stop: $syslog -# Default-Start: 5 -# Default-Stop: 1 -# Short-Description: Osmocom GSM Network in the Box -### END INIT INFO - -DAEMON=/usr/bin/osmo-nitb -NAME=osmo-nitb -DESC="Osmocom GSM Network in the Box" -NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" - -OSMOBTS_EXTRA_ARGS="" -NO_START=1 - -set -e - -test ! -r /etc/default/osmo-nitb || . /etc/default/osmo-nitb -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S \ - -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 0d0dda9..7fc6308 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -5,6 +5,6 @@ PR = "${INC_PR}.0" SRCREV = "${AUTOREV}" -SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" +SRC_URI = "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" -- To view, visit https://gerrit.osmocom.org/10958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 Gerrit-Change-Number: 10958 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 Sat Sep 15 08:02:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:29 +0000 Subject: Change in meta-telephony[laforge/nightly]: openbsc: handle systemd and cfg files through autotools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10959 ) Change subject: openbsc: handle systemd and cfg files through autotools ...................................................................... openbsc: handle systemd and cfg files through autotools Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 6 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ca3b124..71921b7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -6,30 +6,21 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" -INC_PR = "r3.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r4.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" inherit autotools systemd pkgconfig do_install_append() { - install -d ${D}${sysconfdir}/osmocom - install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg - install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg - install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg - - # Install systemd files and enable on sysinit - install -d ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/ - install -d ${D}/var/lib/osmocom - } +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp" -- To view, visit https://gerrit.osmocom.org/10959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 10959 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 Sat Sep 15 08:02:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:46 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Split into .inc and _git.bb In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10944 ) Change subject: osmo-ggsn: Split into .inc and _git.bb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10944 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: Ic92309726c6a256c7e543a2be04725023d43d9b7 Gerrit-Change-Number: 10944 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:02: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 Sep 15 08:02:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:02:48 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Split into .inc and _git.bb In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10944 ) Change subject: osmo-ggsn: Split into .inc and _git.bb ...................................................................... osmo-ggsn: Split into .inc and _git.bb Change-Id: Ic92309726c6a256c7e543a2be04725023d43d9b7 --- A recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 2 files changed, 43 insertions(+), 40 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc new file mode 100644 index 0000000..49dd1ee --- /dev/null +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -0,0 +1,38 @@ +DESCRIPTION = "Osmocom GGSN implementation" +HOMEPAGE = "https://osmocom.org/projects/openggsn" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +DEPENDS = "libosmocore" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" +RDEPENDS_${PN} += "iptables" +RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" + +inherit autotools update-rc.d pkgconfig systemd + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${systemd_system_unitdir}/ + install -d ${D}/${sysconfdir}/osmocom/ + + install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn + install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ +} + +SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" + +INITSCRIPT_PACKAGES = "osmo-ggsn" +INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" +INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" + +CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" + +FILES_libgtp = "${libdir}/*${SOLIBS}" +FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" +FILES_libgtp-staticdev = "${libdir}/*.a" + +FILES_osmo-sgsnemu = "${bindir}/sgsnemu" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 8c948cc..5219c03 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,45 +1,10 @@ -DESCRIPTION = "Osmocom GGSN implementation" -HOMEPAGE = "https://osmocom.org/projects/openggsn" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "1.2.2+gitr${SRCPV}" -PR = "r0" +require ${PN}.inc +S = "${WORKDIR}/git" SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ - file://libgtp-queue_depth_32.patch \ + file://libgtp-queue_depth_32.patch \ " -S = "${WORKDIR}/git" - -DEPENDS = "libosmocore" - -PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" -RDEPENDS_${PN} += "iptables" -RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" - -inherit autotools update-rc.d pkgconfig systemd - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}/${sysconfdir}/osmocom/ - - install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn - install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/ -} - -SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service" - -INITSCRIPT_PACKAGES = "osmo-ggsn" -INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn" -INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29" - -CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg" - -FILES_libgtp = "${libdir}/*${SOLIBS}" -FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" -FILES_libgtp-staticdev = "${libdir}/*.a" - -FILES_osmo-sgsnemu = "${bindir}/sgsnemu" +PV = "1.2.2+gitr${SRCPV}" +PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/10944 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: Ic92309726c6a256c7e543a2be04725023d43d9b7 Gerrit-Change-Number: 10944 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 Sat Sep 15 08:03:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:03:06 +0000 Subject: Change in libosmo-sccp[master]: debian: Document why enable-static is used in dh_auto_configure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10947 ) Change subject: debian: Document why enable-static is used in dh_auto_configure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10947 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: I4a7215d350e023dceadc5826be68ce366a185da1 Gerrit-Change-Number: 10947 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 08:03:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:03:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:03:07 +0000 Subject: Change in libosmo-sccp[master]: debian: Document why enable-static is used in dh_auto_configure In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10947 ) Change subject: debian: Document why enable-static is used in dh_auto_configure ...................................................................... debian: Document why enable-static is used in dh_auto_configure Change-Id: I4a7215d350e023dceadc5826be68ce366a185da1 --- M debian/rules 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 6e69d24..0bf9673 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,8 @@ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install +# enable-static: we require the tests to link to the static libosmo-sigtran +# library to access symbols not starting with osmo_* override_dh_auto_configure: dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10947 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: I4a7215d350e023dceadc5826be68ce366a185da1 Gerrit-Change-Number: 10947 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 Sat Sep 15 08:03:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:03:22 +0000 Subject: Change in osmo-bts[master]: doc/examples/Makefile: Install bts-mgr cfg files used by systemd serv... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10946 ) Change subject: doc/examples/Makefile: Install bts-mgr cfg files used by systemd services ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10946 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: Iaf362da2a9ebd6829391637252812c2be93e9c60 Gerrit-Change-Number: 10946 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 08:03:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 08:03:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 08:03:24 +0000 Subject: Change in osmo-bts[master]: doc/examples/Makefile: Install bts-mgr cfg files used by systemd serv... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10946 ) Change subject: doc/examples/Makefile: Install bts-mgr cfg files used by systemd services ...................................................................... doc/examples/Makefile: Install bts-mgr cfg files used by systemd services Change-Id: Iaf362da2a9ebd6829391637252812c2be93e9c60 --- M doc/examples/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 241f579..04f8279 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -12,7 +12,7 @@ sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg EXTRA_DIST += $(doc_sysmo_DATA) -OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg +OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg sysmo/sysmobts-mgr.cfg endif if ENABLE_TRX @@ -39,7 +39,7 @@ litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg EXTRA_DIST += $(doc_lc15_DATA) -OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg +OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif osmoconfdir = $(sysconfdir)/osmocom -- To view, visit https://gerrit.osmocom.org/10946 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: Iaf362da2a9ebd6829391637252812c2be93e9c60 Gerrit-Change-Number: 10946 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 Sat Sep 15 09:00:20 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Sep 2018 09:00:20 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10967 Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Install to /bin as it doesn't require special privileges.. This makes packaging the binary for the gsm tester more easy. Change-Id: Ibe572a4c17871785b623e70acc7f5da056f945e5 --- M src/host/virt_phy/src/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/10967/1 diff --git a/src/host/virt_phy/src/Makefile.am b/src/host/virt_phy/src/Makefile.am index 48f9de7..bfd0dfa 100644 --- a/src/host/virt_phy/src/Makefile.am +++ b/src/host/virt_phy/src/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/../layer23/include -sbin_PROGRAMS = virtphy +bin_PROGRAMS = virtphy virtphy_SOURCES = virtphy.c l1ctl_sock.c gsmtapl1_if.c l1ctl_sap.c virt_prim_pm.c virt_prim_fbsb.c virt_prim_rach.c virt_prim_data.c virt_prim_traffic.c virt_l1_sched_simple.c logging.c virt_l1_model.c shared/virtual_um.c shared/osmo_mcast_sock.c virtphy_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) virtphy_LDFLAGS = -pthread -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:14:46 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Sep 2018 09:14:46 +0000 Subject: Change in osmocom-bb[master]: Add includes so the file can be included by itself Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10968 Change subject: Add includes so the file can be included by itself ...................................................................... Add includes so the file can be included by itself Add missing dependencies to make this file be includeable as the only file. Change-Id: I05b5f689f389b89deb5ff49507486b246111fc59 --- M src/host/layer23/include/osmocom/bb/mobile/gsm322.h 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/10968/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 -- To view, visit https://gerrit.osmocom.org/10968 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: I05b5f689f389b89deb5ff49507486b246111fc59 Gerrit-Change-Number: 10968 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:22:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:22:13 +0000 Subject: Change in osmo-hlr[master]: tweak example config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10940 ) Change subject: tweak example config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10940 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: I8296832704d779df5f1b20a595b568c99780e64d Gerrit-Change-Number: 10940 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 09:22:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:22:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:22:52 +0000 Subject: Change in openbsc[master]: nat: return -EBADF in read wqueue cb on fd closed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10937 ) Change subject: nat: return -EBADF in read wqueue cb on fd closed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10937 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: I55c1a88f6524e897c70abf8ba18f1bb2b1f650aa Gerrit-Change-Number: 10937 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 09:22:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:23:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:08 +0000 Subject: Change in openbsc[master]: cosmetic: Remove duplicate semicolon and whitespace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10934 ) Change subject: cosmetic: Remove duplicate semicolon and whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10934 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: Ib36b8937d1210488784ebae6917cb1b4c871c9d4 Gerrit-Change-Number: 10934 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 09:23:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:23:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:18 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10935 ) Change subject: nat: Remove misleading comment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10935 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: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 Gerrit-Change-Number: 10935 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 09:23:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:23:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:34 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10936 ) Change subject: nat: Remove misleading comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10936 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: I88ca95d46f4ace1da4025d12302422dbfa578354 Gerrit-Change-Number: 10936 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: Sat, 15 Sep 2018 09: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 Sat Sep 15 09:23:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:37 +0000 Subject: Change in openbsc[master]: cosmetic: Remove duplicate semicolon and whitespace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10934 ) Change subject: cosmetic: Remove duplicate semicolon and whitespace ...................................................................... cosmetic: Remove duplicate semicolon and whitespace Change-Id: Ib36b8937d1210488784ebae6917cb1b4c871c9d4 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 45f53bc..0c91d04 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1208,7 +1208,7 @@ } /* hand data to a side channel */ - if (bsc_ussd_check(con, parsed, msg) == 1) + if (bsc_ussd_check(con, parsed, msg) == 1) con->con_local = NAT_CON_END_USSD; /* @@ -1703,7 +1703,7 @@ nat->msc_con->connection_loss = msc_connection_was_lost; nat->msc_con->connected = msc_connection_connected; nat->msc_con->write_queue.read_cb = ipaccess_msc_read_cb; - nat->msc_con->write_queue.write_cb = ipaccess_msc_write_cb;; + nat->msc_con->write_queue.write_cb = ipaccess_msc_write_cb; nat->msc_con->write_queue.bfd.data = nat->msc_con; bsc_msc_connect(nat->msc_con); -- To view, visit https://gerrit.osmocom.org/10934 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: Ib36b8937d1210488784ebae6917cb1b4c871c9d4 Gerrit-Change-Number: 10934 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 Sat Sep 15 09:23:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:37 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10935 ) Change subject: nat: Remove misleading comment ...................................................................... nat: Remove misleading comment Code is already doing stuff with the connection (fd). Change-Id: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0c91d04..0e69528 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1423,12 +1423,8 @@ if (rc != 0) LOGP(DNAT, LOGL_ERROR, "Failed to set IP_TOS: %s\n", strerror(errno)); - /* todo... do something with the connection */ /* todo... use GNUtls to see if we want to trust this as a BTS */ - /* - * - */ bsc = bsc_connection_alloc(nat); if (!bsc) { LOGP(DNAT, LOGL_ERROR, "Failed to allocate BSC struct.\n"); -- To view, visit https://gerrit.osmocom.org/10935 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: Ieeaa0e024b9542d1a22a8e3ab4c3229a6f8a0b49 Gerrit-Change-Number: 10935 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 Sat Sep 15 09:23:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:38 +0000 Subject: Change in openbsc[master]: nat: Remove misleading comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10936 ) Change subject: nat: Remove misleading comment ...................................................................... nat: Remove misleading comment PONG is being sent a as an answer to PING a few lines above in same function. Change-Id: I88ca95d46f4ace1da4025d12302422dbfa578354 --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0e69528..8cc0f2d 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1369,7 +1369,6 @@ return bsc_nat_handle_ctrlif_msg(bsc, msg); } - /* FIXME: Currently no PONG is sent to the BSC */ /* FIXME: Currently no ID ACK is sent to the BSC */ forward_sccp_to_msc(bsc, msg, &fd_closed); return fd_closed ? -EBADF : 0; -- To view, visit https://gerrit.osmocom.org/10936 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: I88ca95d46f4ace1da4025d12302422dbfa578354 Gerrit-Change-Number: 10936 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 Sat Sep 15 09:23:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:23:39 +0000 Subject: Change in openbsc[master]: nat: return -EBADF in read wqueue cb on fd closed In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10937 ) Change subject: nat: return -EBADF in read wqueue cb on fd closed ...................................................................... nat: return -EBADF in read wqueue cb on fd closed bsc_msc_lost will close the current fd (without freeing it), so let's skip possible writes to an already closed fd bsc_msc_lost will close the current fd (without freeing it), so let's skip possible writes to an already closed fd.. Change-Id: I55c1a88f6524e897c70abf8ba18f1bb2b1f650aa --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 8cc0f2d..c8a9e74 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -864,7 +864,7 @@ msc_con->name, ret); bsc_msc_lost(msc_con); - return -1; + return -EBADF; } LOGP(DNAT, LOGL_DEBUG, -- To view, visit https://gerrit.osmocom.org/10937 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: I55c1a88f6524e897c70abf8ba18f1bb2b1f650aa Gerrit-Change-Number: 10937 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 Sat Sep 15 09:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:25:38 +0000 Subject: Change in osmo-bts[master]: add vty config for GSMTAP-SAPI remote host (-i) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10808 ) Change subject: add vty config for GSMTAP-SAPI remote host (-i) ...................................................................... Patch Set 2: > the gsmtap host setting only has effect during program startup, the > vty command doesn't actively change over to another address -- my > aim was to configure ot from .cfg file to not have to change the > cmdline, not to switch it in the running program ... then again, > maybe it should be doing that? I think it would be best if any VTY configurable changes take effect eventuaally. So far we should have settings that either * take action immediately * take action after some delay (like OML-reestablishment) I think having VTY config statements that will never take action at all is very misleading to the user > Or, even if it doesn't do it yet, keep that option for the future > and not even start supporting arbitrary host names now? I would say let's make it reconfigurable right away, and at that time enforce only IP addresses are accepted. -- To view, visit https://gerrit.osmocom.org/10808 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: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 09:25:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:26:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:26:01 +0000 Subject: Change in osmo-gsm-tester[master]: Sanitize existing suite names In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10931 ) Change subject: Sanitize existing suite names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10931 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: Idea2e053d337548e0e9b1b47441dbb262124f909 Gerrit-Change-Number: 10931 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 15 Sep 2018 09:26: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 Sep 15 09:27:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:27:03 +0000 Subject: Change in libosmocore[master]: logging vty: add 'logging level set-all ' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10889 ) Change subject: logging vty: add 'logging level set-all ' ...................................................................... Patch Set 2: neels: you have the log related power/authority, please merge whenever you think it's ready. -- To view, visit https://gerrit.osmocom.org/10889 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: I4c3e4f786476cb813fdc0a7c64f30ee04758309d Gerrit-Change-Number: 10889 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 15 Sep 2018 09:27: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 Sep 15 09:27:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:27:22 +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 submitted this change and it was merged. ( 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. 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(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified 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: merged Gerrit-Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 Gerrit-Change-Number: 10684 Gerrit-PatchSet: 4 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 gerrit-no-reply at lists.osmocom.org Sat Sep 15 09:32:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 09:32:15 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps: Add liblimesuite-dev for osmo-trx-lms Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10969 Change subject: osmocom_build_deps: Add liblimesuite-dev for osmo-trx-lms ...................................................................... osmocom_build_deps: Add liblimesuite-dev for osmo-trx-lms Change-Id: I37d1f2482a03968f0a9d83a6ebda64651733a983 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/69/10969/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 71bf9f1..7b8bdad 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -103,4 +103,5 @@ install_recommends: no with_items: - liblua5.3-dev + - liblimesuite-dev when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' -- To view, visit https://gerrit.osmocom.org/10969 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: I37d1f2482a03968f0a9d83a6ebda64651733a983 Gerrit-Change-Number: 10969 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 10:04:10 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Sep 2018 10:04:10 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add overload to clone repo and build in subdirectory Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10970 Change subject: build: Add overload to clone repo and build in subdirectory ...................................................................... build: Add overload to clone repo and build in subdirectory To build osmo-nitb we need to clone "openbsc" and then enter the "openbsc" sub-directory. For building "mobile" and "virt_phy" of OsmocomBB we will need to do something similar. Instead of added more hardcoded paths, add a variant that allows to specify the source directory. Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53 --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-nitb.sh 2 files changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/70/10970/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 731bf58..c2ffbb4 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -12,6 +12,7 @@ # build_repo libosmocore --configure --opts # build_repo libosmo-foo special_branch --configure --opts # build_repo osmo-bar +# build_repo_dir openbsc ./openbsc # # create_bin_tgz #-------------- @@ -98,11 +99,19 @@ build_repo() { # usage: build_repo [] [--configure-opts [...]] + dir="$1" + shift + build_repo_dir "${dir}" "./" $@ +} + +build_repo_dir() { + # usage: build_repo_dir [] [--configure-opts [...]] dep="$1" + dir="$2" branch="master" - if [ -z "$(echo "$2" | grep '^-')" ]; then + if [ -z "$(echo "$3" | grep '^-')" ]; then # second arg does not start with a dash, it's empty or a branch - branch="$2" + branch="$3" if [ -n "$branch" ]; then # we had a branch arg, need to shift once more to get config options shift @@ -111,6 +120,7 @@ fi fi shift + shift configure_opts="$@" set +x; echo " @@ -122,12 +132,7 @@ have_repo "$dep" "$branch" - cd "$dep" - - # special shim: we know the openbsc.git needs to be built in the openbsc/ subdir. - if [ "$dep" = "openbsc" ]; then - cd openbsc - fi + cd "$dep/${dir}" set +x; echo; echo; set -x autoreconf -fi diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index 1e3ecc6..4f81fa8 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -10,6 +10,6 @@ build_repo openggsn build_repo libsmpp34 build_repo libosmo-sccp -build_repo openbsc --enable-smpp --enable-osmo-bsc --enable-nat +build_repo_dir openbsc openbsc --enable-smpp --enable-osmo-bsc --enable-nat create_bin_tgz "osmo-nitb osmo-bsc_mgcp" -- To view, visit https://gerrit.osmocom.org/10970 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: I67fbd54296f2c68316bf8e89cfeb37d147193d53 Gerrit-Change-Number: 10970 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 10:04:10 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Sep 2018 10:04:10 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add script to build the mobile application Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10971 Change subject: build: Add script to build the mobile application ...................................................................... build: Add script to build the mobile application Change-Id: I2c537e56aa982b0b4a703fa78c77ade507738b68 --- A contrib/jenkins-build-mobile.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/71/10971/1 diff --git a/contrib/jenkins-build-mobile.sh b/contrib/jenkins-build-mobile.sh new file mode 100755 index 0000000..ff2ae78 --- /dev/null +++ b/contrib/jenkins-build-mobile.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -e -x +base="$PWD" +name="mobile" +. "$(dirname "$0")/jenkins-build-common.sh" + +build_repo libosmocore --enable-sanitize --disable-doxygen +build_repo_dir osmocom-bb src/host/layer23 --enable-sanitize + +create_bin_tgz "mobile" -- To view, visit https://gerrit.osmocom.org/10971 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: I2c537e56aa982b0b4a703fa78c77ade507738b68 Gerrit-Change-Number: 10971 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 10:04:11 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Sep 2018 10:04:11 +0000 Subject: Change in osmo-gsm-tester[master]: Add script to build virt_phy of OsmocomBB Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10972 Change subject: Add script to build virt_phy of OsmocomBB ...................................................................... Add script to build virt_phy of OsmocomBB Change-Id: I1f14ce43db2f5e16f94dc975e7496dceb4f4b72a --- A contrib/jenkins-build-virt_phy.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/72/10972/1 diff --git a/contrib/jenkins-build-virt_phy.sh b/contrib/jenkins-build-virt_phy.sh new file mode 100755 index 0000000..4f00290 --- /dev/null +++ b/contrib/jenkins-build-virt_phy.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -e -x +base="$PWD" +name="mobile" +. "$(dirname "$0")/jenkins-build-common.sh" + +build_repo libosmocore --enable-sanitize --disable-doxygen +build_repo_dir osmocom-bb src/host/virt_phy --enable-sanitize + +create_bin_tgz "virt_phy" -- To view, visit https://gerrit.osmocom.org/10972 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: I1f14ce43db2f5e16f94dc975e7496dceb4f4b72a Gerrit-Change-Number: 10972 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 11:12:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Sep 2018 11:12:08 +0000 Subject: Change in osmo-ci[master]: Add building for "mobile" and "virt_phy" as well Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10973 Change subject: Add building for "mobile" and "virt_phy" as well ...................................................................... Add building for "mobile" and "virt_phy" as well Add rep for mobile and virt_phy and trigger it by osmocom-bb being triggered. This should lead to it being built and usable for testing. Change-Id: I7b2e6111f8b41219e9b2621be5720b9a738c69de --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/10973/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 748062d..6e3f1ab 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -24,6 +24,10 @@ triggered-by: master-osmo-bts - osmo-pcu-sysmo: triggered-by: master-osmo-pcu + - mobile: + triggered-by: master-osmocom-bb + - virt_phy: + triggered-by: master-osmocom-bb triggered-by: 'master-{repo}' jobs: -- To view, visit https://gerrit.osmocom.org/10973 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: I7b2e6111f8b41219e9b2621be5720b9a738c69de Gerrit-Change-Number: 10973 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Sep 15 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 15 Sep 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_#247?= In-Reply-To: <1271148833.116.1536937806702.JavaMail.jenkins@jenkins.osmocom.org> References: <1271148833.116.1536937806702.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <694799733.127.1537024206614.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_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_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_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 -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 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 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 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_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 Sat Sep 15 18:44:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 15 Sep 2018 18:44:47 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TDMA frame math helpers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10942 ) Change subject: trxcon/scheduler: introduce TDMA frame math helpers ...................................................................... Patch Set 1: (1 comment) I am wondering, may we share this code somewhere in libosmocore? I just checked both OsmocomBB firmware and osmo-bts-trx - in both cases the frame number of decoded L2 frame on TCH/H is calculated in a wrong way. The firmware is just using frame number of the last burst, while OsmoBTS is using frame number of 3/4 burst for speech, and 5/6 burst for FACCH/H (bid == 0). TCH/F channel is also affected: the firmware is using frame number of the last 8/8 burst, osmo-bts-trx is using frame number of 4/8 burst, while for xCCH the correct frame number of 1/4 burst is used everywhere... This also raises a question: why should we use frame number of the first burst in general? Why not frame number of the last? https://gerrit.osmocom.org/#/c/10942/1/src/host/trxcon/scheduler.h File src/host/trxcon/scheduler.h: https://gerrit.osmocom.org/#/c/10942/1/src/host/trxcon/scheduler.h at 14 PS1, Line 14: #define TDMA_FN_SUM(a, b) \ > you could implement TDMA_FN_INC(fn) as TDMA_FN_SUM(fn, 1) Sure, thanks! -- To view, visit https://gerrit.osmocom.org/10942 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: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 Gerrit-Change-Number: 10942 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 18:44:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 18:54:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 15 Sep 2018 18:54:02 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10459 ) Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres ...................................................................... Set Ready For Review -- 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: comment Gerrit-Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 Gerrit-Change-Number: 10459 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 18:54:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 15 Sep 2018 19:15:05 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add TCH/H channel support In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10460 ) Change subject: trxcon/scheduler: add TCH/H channel support ...................................................................... Set Ready For Review -- 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: comment Gerrit-Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67 Gerrit-Change-Number: 10460 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:15: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 Sep 15 19:15:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 15 Sep 2018 19:15:18 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10459 ) Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres ...................................................................... Set Ready For Review -- 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: comment Gerrit-Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 Gerrit-Change-Number: 10459 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:15:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 15 Sep 2018 19:15:22 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TDMA frame math helpers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10942 ) Change subject: trxcon/scheduler: introduce TDMA frame math helpers ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10942 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: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 Gerrit-Change-Number: 10942 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:15:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:22:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 15 Sep 2018 19:22:29 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10698 ) Change subject: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg ...................................................................... Set Ready For Review -- 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: comment Gerrit-Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c Gerrit-Change-Number: 10698 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:22:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:47:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 19:47:41 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TDMA frame math helpers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10942 ) Change subject: trxcon/scheduler: introduce TDMA frame math helpers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10942 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: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 Gerrit-Change-Number: 10942 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:47:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:48:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 19:48:08 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10459 ) Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment Gerrit-Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 Gerrit-Change-Number: 10459 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:48:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 19:48:22 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TDMA frame math helpers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10942 ) Change subject: trxcon/scheduler: introduce TDMA frame math helpers ...................................................................... trxcon/scheduler: introduce TDMA frame math helpers The 'normal' math operations, such as addition and substraction, are not applicable for TDMA frame numbers because they may result in out-of-range values. Having TDMA frame math helpers in a single place would allow one to avoid possible out-of-range result mistakes. Change-Id: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_trx.c M src/host/trxcon/scheduler.h 3 files changed, 16 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index dab9578..d4054c9 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -83,8 +83,7 @@ timespecadd(tv_clock, &frame_duration, tv_clock); elapsed_us -= FRAME_DURATION_uS; - sched->fn_counter_proc = (sched->fn_counter_proc + 1) - % GSM_HYPERFRAME; + sched->fn_counter_proc = TDMA_FN_INC(sched->fn_counter_proc); /* Call frame callback */ if (sched->clock_cb) @@ -142,8 +141,7 @@ /* Calculate elapsed time / frames since last processed fn */ 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; + elapsed_fn = TDMA_FN_SUB(fn, sched->fn_counter_proc); if (elapsed_fn >= 135774) elapsed_fn -= GSM_HYPERFRAME; @@ -181,8 +179,7 @@ /* Transmit what we still need to transmit */ while (fn != sched->fn_counter_proc) { - sched->fn_counter_proc = (sched->fn_counter_proc + 1) - % GSM_HYPERFRAME; + sched->fn_counter_proc = TDMA_FN_INC(sched->fn_counter_proc); /* Call frame callback */ if (sched->clock_cb) diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 8bd3c72..e20da39 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -65,8 +65,8 @@ * Advance frame number, giving the transceiver more * time until a burst must be transmitted... */ - fn = (sched->fn_counter_proc + sched->fn_counter_advance) - % GSM_HYPERFRAME; + fn = TDMA_FN_SUM(sched->fn_counter_proc, + sched->fn_counter_advance); /* Get frame from multiframe */ offset = fn % ts->mf_layout->period; @@ -608,15 +608,14 @@ } /* Calculate how many frames have been elapsed */ - elapsed = (burst_fn + GSM_HYPERFRAME - ts->mf_last_fn); - elapsed %= GSM_HYPERFRAME; + elapsed = TDMA_FN_SUB(burst_fn, ts->mf_last_fn); /** * If not too many frames have been elapsed, * start counting from last fn + 1 */ if (elapsed < 10) - fn = (ts->mf_last_fn + 1) % GSM_HYPERFRAME; + fn = TDMA_FN_INC(ts->mf_last_fn); else fn = burst_fn; @@ -658,7 +657,7 @@ if (fn == burst_fn) break; - fn = (fn + 1) % GSM_HYPERFRAME; + fn = TDMA_FN_INC(fn); } /* Set last processed frame number */ diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index ddb863f..fccf7d2 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -10,6 +10,14 @@ #define GSM_SUPERFRAME (26 * 51) #define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME) +/* TDMA frame number arithmetics */ +#define TDMA_FN_SUM(a, b) \ + ((a + b) % GSM_HYPERFRAME) +#define TDMA_FN_SUB(a, b) \ + ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME) +#define TDMA_FN_INC(fn) \ + TDMA_FN_SUM(fn, 1) + enum tdma_sched_clck_state { SCH_CLCK_STATE_WAIT, SCH_CLCK_STATE_OK, -- To view, visit https://gerrit.osmocom.org/10942 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: Ibb66ba846cc3d6c2eaa88414569e5f3751128047 Gerrit-Change-Number: 10942 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sat Sep 15 19:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 19:48:22 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10459 ) Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres ...................................................................... trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres Unlike xCCH, TCH/H channels are using block diagonal interleaving, so every single burst carries 57 bits of one traffic frame, and 57 bits of another one. Moreover, unlike TCH/F where both traffic and FACCH/F frames are interleaved over 8 bursts, a FACCH/H is interleaved over 6 bursts, while a traffic frame is interleaved over 4 bursts. This is why a TCH/H burst transmission can't be initiated on an arbitrary TDMA frame number. It shall be aligned as of stated in GSM 05.02, clause 7, table 1. This change introduces two basic functions: - sched_tchh_block_map_fn - checks if a TCH/H block transmission can be initiated / finished on a given frame number and a given channel type; - sched_tchh_block_dl_first_fn - calculates TDMA frame number of the first burst using given frame number of the last burst; and some auxiliary wrappers to simplify the usage of sched_tchh_block_map_fn(). Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 --- M src/host/trxcon/Makefile.am A src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.h M src/host/trxcon/scheduler.h 5 files changed, 207 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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_tchh.c b/src/host/trxcon/sched_lchan_tchh.c new file mode 100644 index 0000000..316f995 --- /dev/null +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -0,0 +1,183 @@ +/* + * OsmocomBB <-> SDR connection bridge + * TDMA scheduler: handlers for DL / UL bursts on logical channels + * + * (C) 2018 by Vadim Yanitskiy + * + * 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 "scheduler.h" +#include "sched_trx.h" + +static const uint8_t tch_h0_traffic_block_map[3][4] = { + /* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */ + { 0, 2, 4, 6 }, + { 4, 6, 8, 10 }, + { 8, 10, 0, 2 }, +}; + +static const uint8_t tch_h1_traffic_block_map[3][4] = { + /* B0(1,3,5,7), B1(5,7,9,11), B2(9,11,1,3) */ + { 1, 3, 5, 7 }, + { 5, 7, 9, 11 }, + { 9, 11, 1, 3 }, +}; + +static const uint8_t tch_h0_dl_facch_block_map[3][6] = { + /* B0(4,6,8,10,13,15), B1(13,15,17,19,21,23), B2(21,23,0,2,4,6) */ + { 4, 6, 8, 10, 13, 15 }, + { 13, 15, 17, 19, 21, 23 }, + { 21, 23, 0, 2, 4, 6 }, +}; + +static const uint8_t tch_h0_ul_facch_block_map[3][6] = { + /* B0(0,2,4,6,8,10), B1(8,10,13,15,17,19), B2(17,19,21,23,0,2) */ + { 0, 2, 4, 6, 8, 10 }, + { 8, 10, 13, 15, 17, 19 }, + { 17, 19, 21, 23, 0, 2 }, +}; + +static const uint8_t tch_h1_dl_facch_block_map[3][6] = { + /* B0(5,7,9,11,14,16), B1(14,16,18,20,22,24), B2(22,24,1,3,5,7) */ + { 5, 7, 9, 11, 14, 16 }, + { 14, 16, 18, 20, 22, 24 }, + { 22, 24, 1, 3, 5, 7 }, +}; + +const uint8_t tch_h1_ul_facch_block_map[3][6] = { + /* B0(1,3,5,7,9,11), B1(9,11,14,16,18,20), B2(18,20,22,24,1,3) */ + { 1, 3, 5, 7, 9, 11 }, + { 9, 11, 14, 16, 18, 20 }, + { 18, 20, 22, 24, 1, 3 }, +}; + +/** + * Can a TCH/H block transmission be initiated / 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 + * @param ul Uplink or Downlink? + * @param facch FACCH/H or traffic? + * @param start init or end of transmission? + * @return true (yes) or false (no) + */ +bool sched_tchh_block_map_fn(enum trx_lchan_type chan, + uint32_t fn, bool ul, bool facch, bool start) +{ + uint8_t fn_mf; + int i = 0; + + /* Just to be sure */ + OSMO_ASSERT(chan == TRXC_TCHH_0 || chan == TRXC_TCHH_1); + + /* Calculate a modulo */ + fn_mf = facch ? (fn % 26) : (fn % 13); + +#define MAP_GET_POS(map) \ + (start ? 0 : ARRAY_SIZE(map[i]) - 1) + +#define BLOCK_MAP_FN(map) \ + do { \ + if (map[i][MAP_GET_POS(map)] == fn_mf) \ + return true; \ + } while (++i < ARRAY_SIZE(map)) + + /* Choose a proper block map */ + if (facch) { + if (ul) { + if (chan == TRXC_TCHH_0) + BLOCK_MAP_FN(tch_h0_ul_facch_block_map); + else + BLOCK_MAP_FN(tch_h1_ul_facch_block_map); + } else { + if (chan == TRXC_TCHH_0) + BLOCK_MAP_FN(tch_h0_dl_facch_block_map); + else + BLOCK_MAP_FN(tch_h1_dl_facch_block_map); + } + } else { + if (chan == TRXC_TCHH_0) + BLOCK_MAP_FN(tch_h0_traffic_block_map); + else + BLOCK_MAP_FN(tch_h1_traffic_block_map); + } + + return false; +} + +/** + * Calculates a frame number of the first burst + * using given frame number of the last burst. + * + * See GSM 05.02, clause 7, table 1 + * + * @param chan channel type (TRXC_TCHH_0 or TRXC_TCHH_1) + * @param last_fn frame number of the last burst + * @param facch FACCH/H or traffic? + * @return either frame number of the first burst, + * or fn=last_fn if calculation failed + */ +uint32_t sched_tchh_block_dl_first_fn(enum trx_lchan_type chan, + uint32_t last_fn, bool facch) +{ + uint8_t fn_mf, fn_diff; + int i = 0; + + /* Just to be sure */ + OSMO_ASSERT(chan == TRXC_TCHH_0 || chan == TRXC_TCHH_1); + + /* Calculate a modulo */ + fn_mf = facch ? (last_fn % 26) : (last_fn % 13); + +#define BLOCK_FIRST_FN(map) \ + do { \ + if (map[i][ARRAY_SIZE(map[i]) - 1] == fn_mf) { \ + fn_diff = TDMA_FN_DIFF(fn_mf, map[i][0]); \ + return TDMA_FN_SUB(last_fn, fn_diff); \ + } \ + } while (++i < ARRAY_SIZE(map)) + + /* Choose a proper block map */ + if (facch) { + if (chan == TRXC_TCHH_0) + BLOCK_FIRST_FN(tch_h0_dl_facch_block_map); + else + BLOCK_FIRST_FN(tch_h1_dl_facch_block_map); + } else { + if (chan == TRXC_TCHH_0) + BLOCK_FIRST_FN(tch_h0_traffic_block_map); + else + BLOCK_FIRST_FN(tch_h1_traffic_block_map); + } + + LOGP(DSCHD, LOGL_ERROR, "Failed to calculate TDMA " + "frame number of the first burst of %s block, " + "using the current fn=%u\n", facch ? + "FACCH/H" : "TCH/H", last_fn); + + /* Couldn't calculate the first fn, return the last */ + return last_fn; +} diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e663bc3..6b160d1 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_tchh_facch_start(lchan_type, fn, true); 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..2c8b4d8 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -323,3 +323,19 @@ 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 TCH/H block TDMA frame mapping */ +uint32_t sched_tchh_block_dl_first_fn(enum trx_lchan_type chan, + uint32_t last_fn, bool facch); +bool sched_tchh_block_map_fn(enum trx_lchan_type chan, + uint32_t fn, bool ul, bool facch, bool start); + +#define sched_tchh_traffic_start(chan, fn, ul) \ + sched_tchh_block_map_fn(chan, fn, ul, 0, 1) +#define sched_tchh_traffic_end(chan, fn, ul) \ + sched_tchh_block_map_fn(chan, fn, ul, 0, 0) + +#define sched_tchh_facch_start(chan, fn, ul) \ + sched_tchh_block_map_fn(chan, fn, ul, 1, 1) +#define sched_tchh_facch_end(chan, fn, ul) \ + sched_tchh_block_map_fn(chan, fn, ul, 1, 0) diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index fccf7d2..7ab17ab 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -17,6 +17,10 @@ ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME) #define TDMA_FN_INC(fn) \ TDMA_FN_SUM(fn, 1) +#define TDMA_FN_MIN(a, b) \ + (a < b ? a : b) +#define TDMA_FN_DIFF(a, b) \ + TDMA_FN_MIN(TDMA_FN_SUB(a, b), TDMA_FN_SUB(b, a)) enum tdma_sched_clck_state { SCH_CLCK_STATE_WAIT, -- 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: merged Gerrit-Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 Gerrit-Change-Number: 10459 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy 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 Sat Sep 15 19:48:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 15 Sep 2018 19:48:23 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add TCH/H channel support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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/sched_lchan_desc.c M src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 4 files changed, 331 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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 index 316f995..7fb2809 100644 --- a/src/host/trxcon/sched_lchan_tchh.c +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -3,6 +3,7 @@ * TDMA scheduler: handlers for DL / UL bursts on logical channels * * (C) 2018 by Vadim Yanitskiy + * (C) 2018 by Harald Welte * * All Rights Reserved * @@ -23,11 +24,27 @@ */ #include +#include #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" static const uint8_t tch_h0_traffic_block_map[3][4] = { /* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */ @@ -181,3 +198,305 @@ /* Couldn't calculate the first fn, return the last */ return last_fn; } + +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; + size_t l2_len; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + 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); + + if (*mask == 0x00) { + /* Align to the first burst */ + if (bid > 0) + return 0; + + /* Align reception of the first FACCH/H frame */ + if (lchan->tch_mode == GSM48_CMODE_SIGN) { + if (!sched_tchh_facch_start(lchan->type, fn, 0)) + return 0; + } else { /* or TCH/H traffic frame */ + if (!sched_tchh_traffic_start(lchan->type, fn, 0)) + return 0; + } + } + + /* Update mask */ + *mask |= (1 << bid); + + /** + * FIXME: properly update measurements + * + * Since TCH/H channel is using block-diagonal interleaving, + * a single burst may carry 57 bits of one encoded frame, + * and 57 bits of another. This should be taken into account. + */ + 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 the second burst */ + if (bid != 1) + return 0; + + /* Wait for complete set of bursts */ + if (lchan->tch_mode == GSM48_CMODE_SIGN) { + /* FACCH/H is interleaved over 6 bursts */ + if ((*mask & 0x3f) != 0x3f) + goto bfi_shift; + } else { + /* Traffic is interleaved over 4 bursts */ + if ((*mask & 0x0f) != 0x0f) + goto bfi_shift; + } + + /* Skip decoding attempt in case of FACCH/H */ + if (lchan->dl_ongoing_facch) { + lchan->dl_ongoing_facch = false; + goto bfi_shift; /* 2/2 BFI */ + } + + switch (lchan->tch_mode) { + case GSM48_CMODE_SIGN: + case GSM48_CMODE_SPEECH_V1: /* HR */ + rc = gsm0503_tch_hr_decode(l2, buffer, + !sched_tchh_facch_end(lchan->type, fn, 0), + &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); + + /* Shift burst mask */ + *mask = *mask << 2; + + /* Check decoding result */ + if (rc < 4) { + LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame ending at " + "fn=%u on %s (rc=%d)\n", fn, lchan_desc->name, rc); + + /* Send BFI */ + goto bfi; + } else if (rc == GSM_MACBLOCK_LEN) { + /* Skip decoding of the next 2 stolen bursts */ + lchan->dl_ongoing_facch = true; + + /* Calculate TDMA frame number of the first burst */ + lchan->rx_first_fn = sched_tchh_block_dl_first_fn(lchan->type, + fn, true); /* FACCH/H */ + + /* FACCH/H received, forward to the higher layers */ + sched_send_dt_ind(trx, ts, lchan, l2, GSM_MACBLOCK_LEN, + n_errors, false, false); + + /* 1/2 BFI */ + goto bfi; + } else { + /* A good TCH frame received */ + l2_len = rc; + } + + /* Calculate TDMA frame number of the first burst */ + lchan->rx_first_fn = sched_tchh_block_dl_first_fn(lchan->type, + fn, false); /* TCH/H */ + + /* Send a traffic frame to the higher layers */ + return sched_send_dt_ind(trx, ts, lchan, l2, l2_len, + n_errors, false, true); + +bfi_shift: + /* Shift buffer */ + memcpy(buffer, buffer + 232, 232); + memcpy(buffer + 232, buffer + 464, 232); + + /* Shift burst mask */ + *mask = *mask << 2; + +bfi: + /* Didn't try to decode */ + if (n_errors < 0) + n_errors = 116 * 2; + + /* Calculate TDMA frame number of the first burst */ + lchan->rx_first_fn = sched_tchh_block_dl_first_fn(lchan->type, + fn, false); /* TCH/H */ + + /* BFI is not applicable in signalling mode */ + if (lchan->tch_mode == GSM48_CMODE_SIGN) + return sched_send_dt_ind(trx, ts, lchan, NULL, 0, + n_errors, true, false); + + /* Bad frame indication */ + l2_len = sched_bad_frame_ind(l2, lchan); + + /* 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_tchh_facch_start(lchan->type, fn, 1)) + 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 e20da39..023764d 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 2c8b4d8..08e2489 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: merged Gerrit-Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67 Gerrit-Change-Number: 10460 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy 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 Sat Sep 15 19:52:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 15 Sep 2018 19:52:56 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 1: It's actually not easier since we support using adding binaries from /sbin in there, but it's fine :) -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 19:52:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 15 19:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 15 Sep 2018 19:53:37 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 1: Any idea regarding the origianl rationale to put it in sbin? -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 19:53:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 15 20:08:41 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:08:41 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9d66d28257b_4c4de8c68c702221@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 109s] No package 'libpcsclite' found [ 109s] simtrace2-remsim.o: In function `main': [ 109s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 109s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 109s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 109s] apdu_dispatch.o: In function `apdu_segment_in': [ 109s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 109s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 109s] collect2: error: ld returned 1 exit status [ 109s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 109s] make[2]: *** [simtrace2-remsim] Error 1 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 109s] Makefile:20: recipe for target 'utils' failed [ 109s] make[1]: *** [utils] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] dh_auto_build: make -j1 returned exit code 2 [ 109s] debian/rules:4: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] sheep83 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:08:23 UTC 2018. [ 109s] [ 109s] ### VM INTERACTION START ### [ 112s] [ 105.234518] sysrq: SysRq : Power Off [ 112s] [ 105.241021] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] sheep83 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:08:26 UTC 2018. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:09:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:09:15 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9d66f1cf2d5_4c4de8c68c7024f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 198s] No package 'libpcsclite' found [ 198s] simtrace2-remsim.o: In function `main': [ 198s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 198s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 198s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 198s] apdu_dispatch.o: In function `apdu_segment_in': [ 198s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 198s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 198s] collect2: error: ld returned 1 exit status [ 198s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 198s] make[2]: *** [simtrace2-remsim] Error 1 [ 198s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 198s] Makefile:20: recipe for target 'utils' failed [ 198s] make[1]: *** [utils] Error 2 [ 198s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 198s] dh_auto_build: make -j1 returned exit code 2 [ 198s] debian/rules:4: recipe for target 'build' failed [ 198s] make: *** [build] Error 2 [ 198s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 198s] [ 198s] armbuild02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:07 UTC 2018. [ 198s] [ 198s] ### VM INTERACTION START ### [ 201s] [ 181.248711] SysRq : Power Off [ 201s] [ 181.250278] reboot: Power down [ 201s] ### VM INTERACTION END ### [ 202s] [ 202s] armbuild02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:11 UTC 2018. [ 202s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:09:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:09:15 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9d66f17839c_4c4de8c68c702339@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 139s] No package 'libpcsclite' found [ 139s] simtrace2-remsim.o: In function `main': [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 139s] apdu_dispatch.o: In function `apdu_segment_in': [ 139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 139s] collect2: error: ld returned 1 exit status [ 139s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 139s] make[2]: *** [simtrace2-remsim] Error 1 [ 139s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 139s] Makefile:20: recipe for target 'utils' failed [ 139s] make[1]: *** [utils] Error 2 [ 139s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 139s] dh_auto_build: make -j1 returned exit code 2 [ 139s] debian/rules:4: recipe for target 'build' failed [ 139s] make: *** [build] Error 2 [ 139s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 139s] [ 139s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:08:58 UTC 2018. [ 139s] [ 139s] ### VM INTERACTION START ### [ 142s] [ 131.960618] sysrq: SysRq : Power Off [ 142s] [ 131.969223] reboot: Power down [ 142s] ### VM INTERACTION END ### [ 142s] [ 142s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:02 UTC 2018. [ 142s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:09:32 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:09:32 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9d671054c37_4c4de8c68c7025e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 162s] No package 'libpcsclite' found [ 162s] simtrace2-remsim.o: In function `main': [ 162s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 162s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 162s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 162s] apdu_dispatch.o: In function `apdu_segment_in': [ 162s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 162s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 162s] collect2: error: ld returned 1 exit status [ 162s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 162s] make[2]: *** [simtrace2-remsim] Error 1 [ 162s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 162s] Makefile:20: recipe for target 'utils' failed [ 162s] make[1]: *** [utils] Error 2 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] dh_auto_build: make -j1 returned exit code 2 [ 162s] debian/rules:4: recipe for target 'build' failed [ 162s] make: *** [build] Error 2 [ 162s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 162s] [ 162s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:20 UTC 2018. [ 162s] [ 162s] ### VM INTERACTION START ### [ 166s] [ 150.671119] sysrq: SysRq : Power Off [ 166s] [ 150.682140] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:24 UTC 2018. [ 166s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:09:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:09:50 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9d6710b3a17_4c4de8c68c702629@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 174s] No package 'libpcsclite' found [ 174s] simtrace2-remsim.o: In function `main': [ 174s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 174s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 174s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 174s] apdu_dispatch.o: In function `apdu_segment_in': [ 174s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 174s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 174s] collect2: error: ld returned 1 exit status [ 174s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 174s] make[2]: *** [simtrace2-remsim] Error 1 [ 174s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 174s] Makefile:20: recipe for target 'utils' failed [ 174s] make[1]: *** [utils] Error 2 [ 174s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 174s] dh_auto_build: make -j1 returned exit code 2 [ 174s] debian/rules:4: recipe for target 'build' failed [ 174s] make: *** [build] Error 2 [ 174s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 174s] [ 174s] lamb28 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:34 UTC 2018. [ 174s] [ 174s] ### VM INTERACTION START ### [ 177s] [ 166.069439] sysrq: SysRq : Power Off [ 177s] [ 166.073095] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] lamb28 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:38 UTC 2018. [ 177s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:09:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:09:50 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9d67111fae7_4c4de8c68c70277d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 191s] No package 'libpcsclite' found [ 191s] simtrace2-remsim.o: In function `main': [ 191s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 191s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 191s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 191s] apdu_dispatch.o: In function `apdu_segment_in': [ 191s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 191s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 191s] collect2: error: ld returned 1 exit status [ 191s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 191s] make[2]: *** [simtrace2-remsim] Error 1 [ 191s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 191s] Makefile:20: recipe for target 'utils' failed [ 191s] make[1]: *** [utils] Error 2 [ 191s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 191s] dh_auto_build: make -j1 returned exit code 2 [ 191s] debian/rules:4: recipe for target 'build' failed [ 191s] make: *** [build] Error 2 [ 191s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 191s] [ 191s] cloud106 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:39 UTC 2018. [ 191s] [ 191s] ### VM INTERACTION START ### [ 194s] [ 166.005124] sysrq: SysRq : Power Off [ 194s] [ 166.046758] reboot: Power down [ 195s] ### VM INTERACTION END ### [ 195s] [ 195s] cloud106 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:44 UTC 2018. [ 195s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:09:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:09:50 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9d67115704d_4c4de8c68c7028a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 172s] No package 'libpcsclite' found [ 172s] simtrace2-remsim.o: In function `main': [ 172s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 172s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 172s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 172s] apdu_dispatch.o: In function `apdu_segment_in': [ 172s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 172s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 172s] collect2: error: ld returned 1 exit status [ 172s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 172s] make[2]: *** [simtrace2-remsim] Error 1 [ 172s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 172s] Makefile:20: recipe for target 'utils' failed [ 172s] make[1]: *** [utils] Error 2 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] dh_auto_build: make -j1 returned exit code 2 [ 172s] debian/rules:4: recipe for target 'build' failed [ 172s] make: *** [build] Error 2 [ 172s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 172s] [ 172s] cloud105 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:40 UTC 2018. [ 172s] [ 172s] ### VM INTERACTION START ### [ 175s] [ 154.294412] sysrq: SysRq : Power Off [ 175s] [ 154.309031] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] cloud105 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:46 UTC 2018. [ 177s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:10:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:10:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9d672fa83c8_4c4de8c68c7029e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 181s] No package 'libpcsclite' found [ 181s] simtrace2-remsim.o: In function `main': [ 181s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 181s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 181s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 181s] apdu_dispatch.o: In function `apdu_segment_in': [ 181s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 181s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 181s] collect2: error: ld returned 1 exit status [ 181s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 181s] make[2]: *** [simtrace2-remsim] Error 1 [ 181s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 181s] Makefile:20: recipe for target 'utils' failed [ 181s] make[1]: *** [utils] Error 2 [ 181s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 181s] dh_auto_build: make -j1 returned exit code 2 [ 181s] debian/rules:4: recipe for target 'build' failed [ 181s] make: *** [build] Error 2 [ 181s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 181s] [ 181s] cloud126 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:46 UTC 2018. [ 181s] [ 181s] ### VM INTERACTION START ### [ 185s] [ 159.915694] sysrq: SysRq : Power Off [ 185s] [ 159.925714] reboot: Power down [ 186s] ### VM INTERACTION END ### [ 186s] [ 186s] cloud126 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:51 UTC 2018. [ 186s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 15 20:10:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Sep 2018 20:10:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9d672ff2e4c_4c4de8c68c703090@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 190s] No package 'libpcsclite' found [ 190s] simtrace2-remsim.o: In function `main': [ 190s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 190s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 190s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 190s] apdu_dispatch.o: In function `apdu_segment_in': [ 190s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 190s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 190s] collect2: error: ld returned 1 exit status [ 190s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 190s] make[2]: *** [simtrace2-remsim] Error 1 [ 190s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 190s] Makefile:20: recipe for target 'utils' failed [ 190s] make[1]: *** [utils] Error 2 [ 190s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 190s] dh_auto_build: make -j1 returned exit code 2 [ 190s] debian/rules:4: recipe for target 'build' failed [ 190s] make: *** [build] Error 2 [ 190s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 190s] [ 190s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:53 UTC 2018. [ 190s] [ 190s] ### VM INTERACTION START ### [ 194s] [ 179.852526] sysrq: SysRq : Power Off [ 194s] [ 179.859367] reboot: Power down [ 194s] ### VM INTERACTION END ### [ 194s] [ 194s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 15 20:09:57 UTC 2018. [ 194s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sat Sep 15 23:55:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 15 Sep 2018 23:55:46 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmocore_=C2=BB_a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,amd64,osmocom-master-debian9_#476?= In-Reply-To: <1012601881.125.1536998454297.JavaMail.jenkins@jenkins.osmocom.org> References: <1012601881.125.1536998454297.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1168992891.128.1537055746184.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 520.31 KB...] ## -------------------------------------- ## ## libosmocore 0.12.0.57-2fd4 test suite. ## ## -------------------------------------- ## Regression tests. 1: a5 ok 2: abis ok 3: ctrl ok 4: kasumi ok 5: bits ok 6: bitvec ok 7: bitcomp ok 8: bitfield ok 9: conv ok 10: conv_gsm0503 ok 11: coding ok 12: msgb ok 13: gea ok 14: msgfile ok 15: sms ok 16: smscb ok 17: ussd ok 18: auth ok 19: comp128 ok 20: lapd ok 21: gsm0808 FAILED (testsuite.at:132) 22: gsm0408 ok 23: gprs ok 24: logging ok 25: codec ok 26: codec_ecu_fr ok 27: fr ok 28: loggingrb ok 29: strrb ok 30: vty ok 31: gprs-bssgp ok 32: gprs-ns ok 33: utils ok 34: stats ok 35: write_queue ok 36: bssgp-fc ok 37: sim ok 38: timer ok 39: clk_override ok 40: tlv ok 41: gsup ok 42: fsm ok 43: oap ok 44: oap_client ok 45: socket ok 46: osmo-auc-gen ok 47: endian ok 48: sercomm ok 49: prbs ok 50: gsm23003 ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 50 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [libosmocore 0.12.0.57-2fd4] testsuite: 21 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1997: recipe for target 'check-local' failed make[4]: *** [check-local] Error 1 make[4]: Leaving directory ' Makefile:1766: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:1769: recipe for target 'check' failed make[2]: *** [check] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:905: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh ======================== ./tests/testsuite.dir/21/testsuite.log # -*- compilation -*- 21. testsuite.at:129: testing gsm0808 ... :132: $abs_top_builddir/tests/gsm0808/gsm0808_test stderr: --- expout 2018-09-15 23:55:42.083970342 +0000 +++ 2018-09-15 23:55:42.115969896 +0000 @@ -80,7 +80,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -94,7 +94,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -108,7 +108,7 @@ m5_15= 1 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -122,7 +122,7 @@ m5_15= 0 spare= 0 m5_90= 1 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -136,7 +136,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -150,7 +150,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -164,7 +164,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 1 m10_2= 0 m12_2= 0 @@ -178,7 +178,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 1 m12_2= 0 @@ -192,7 +192,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 1 @@ -206,7 +206,7 @@ m5_15= 1 spare= 0 m5_90= 1 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 0 m12_2= 0 @@ -220,7 +220,7 @@ m5_15= 0 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 1 m10_2= 1 m12_2= 1 @@ -234,7 +234,7 @@ m5_15= 0 spare= 0 m5_90= 1 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 0 m10_2= 1 m12_2= 1 @@ -248,7 +248,7 @@ m5_15= 1 spare= 0 m5_90= 0 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 1 m10_2= 0 m12_2= 0 @@ -262,7 +262,7 @@ m5_15= 1 spare= 0 m5_90= 0 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 1 m7_95= 1 m10_2= 0 m12_2= 1 @@ -276,7 +276,7 @@ m5_15= 0 spare= 0 m5_90= 1 icmi= 0 m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 0 m10_2= 1 m12_2= 0 @@ -290,7 +290,7 @@ m5_15= 1 spare= 0 m5_90= 1 icmi= 0 m6_70= 1 nscb= 0 - m7_40= 1 ver= 0 + m7_40= 1 ver= 1 m7_95= 1 m10_2= 1 m12_2= 1 21. testsuite.at:129: 21. gsm0808 (testsuite.at:129): FAILED (testsuite.at:132) 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 Sep 16 01:44:56 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 16 Sep 2018 01:44:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: correct value of the GSUP_CancelType Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10974 Change subject: library/GSUP_Types: correct value of the GSUP_CancelType ...................................................................... library/GSUP_Types: correct value of the GSUP_CancelType The comment in the c header of OSMO_GSUP_CANCEL_TYPE_UPDATE says: 1 = /* 0 on the wire */, 2 = /* 1 on the wire */ Change-Id: I4d22af9fee19e6036dbb555422759e3c1285416a --- M library/GSUP_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/10974/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 0d21404..7680815 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -79,8 +79,8 @@ } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { - OSMO_GSUP_CANCEL_TYPE_UPDATE (1), - OSMO_GSUP_CANCEL_TYPE_WITHDRAW (2) + OSMO_GSUP_CANCEL_TYPE_UPDATE (0), + OSMO_GSUP_CANCEL_TYPE_WITHDRAW (1) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CnDomain { -- To view, visit https://gerrit.osmocom.org/10974 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: I4d22af9fee19e6036dbb555422759e3c1285416a Gerrit-Change-Number: 10974 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 01:53:54 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 16 Sep 2018 01:53:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: correct value of the GSUP_CancelType In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10974 ) Change subject: library/GSUP_Types: correct value of the GSUP_CancelType ...................................................................... Patch Set 1: Hi Harald, what is correct here? The header says it's 0-1 on the wire. But wireshark also interprets 1-2. osmo-sgsn use 0-1 . https://git.osmocom.org/libosmocore/tree/include/osmocom/gsm/gsup.h -- To view, visit https://gerrit.osmocom.org/10974 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: I4d22af9fee19e6036dbb555422759e3c1285416a Gerrit-Change-Number: 10974 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 16 Sep 2018 01:53:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 01:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 16 Sep 2018 01:58:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: correct value of the GSUP_CancelType In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10974 ) Change subject: library/GSUP_Types: correct value of the GSUP_CancelType ...................................................................... Patch Set 1: related to https://code.wireshark.org/review/#/c/29678/ -- To view, visit https://gerrit.osmocom.org/10974 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: I4d22af9fee19e6036dbb555422759e3c1285416a Gerrit-Change-Number: 10974 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 16 Sep 2018 01:58:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 03:11:26 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 16 Sep 2018 03:11:26 +0000 Subject: Change in osmo-ggsn[master]: libgtp: implement gtp_clear_queues to clear req/resp queue Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10975 Change subject: libgtp: implement gtp_clear_queues to clear req/resp queue ...................................................................... libgtp: implement gtp_clear_queues to clear req/resp queue Clearing the request and response queue is useful for debugging to reset "some" state. Otherwise some tests will get un-expected packages. Change-Id: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/75/10975/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 1d58088..b98fba0 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -496,6 +496,24 @@ return 0; } + +/** + * @brief clear the request and response queue. Useful for debugging to reset "some" state. + * @param gsn The GGSN instance + */ +void gtp_clear_queues(struct gsn_t *gsn) +{ + struct qmsg_t *qmsg; + + while (!queue_getfirst(gsn->queue_req, &qmsg)) { + queue_freemsg(gsn->queue_req, qmsg); + } + + while (!queue_getfirst(gsn->queue_resp, &qmsg)) { + queue_freemsg(gsn->queue_resp, qmsg); + } +} + /* gtp_conf * Remove signalling packet from retransmission queue. * return 0 on success, EOF if packet was not found */ diff --git a/gtp/gtp.h b/gtp/gtp.h index ed594f1..5f35ab5 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -369,6 +369,8 @@ struct pdp_t * pdp, uint8_t recovery)); +void gtp_clear_queues(struct gsn_t *gsn); + /* Internal functions (not part of the API */ extern int gtp_echo_req(struct gsn_t *gsn, int version, void *cbp, -- To view, visit https://gerrit.osmocom.org/10975 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: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d Gerrit-Change-Number: 10975 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 05:14:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:14:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: correct value of the GSUP_CancelType In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10974 ) Change subject: library/GSUP_Types: correct value of the GSUP_CancelType ...................................................................... Patch Set 1: 0/1 is correct, as that's what osmo-sgsn uses and the GSUP protocol spec in osmo-gsm-manuals specifies. So TTCN3 and wireshark are broken. -- To view, visit https://gerrit.osmocom.org/10974 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: I4d22af9fee19e6036dbb555422759e3c1285416a Gerrit-Change-Number: 10974 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 16 Sep 2018 05:14:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 05:14:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:14:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: correct value of the GSUP_CancelType In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10974 ) Change subject: library/GSUP_Types: correct value of the GSUP_CancelType ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10974 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: I4d22af9fee19e6036dbb555422759e3c1285416a Gerrit-Change-Number: 10974 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 16 Sep 2018 05:14: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 Sep 16 05:16:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:16:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: correct value of the GSUP_CancelType In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10974 ) Change subject: library/GSUP_Types: correct value of the GSUP_CancelType ...................................................................... library/GSUP_Types: correct value of the GSUP_CancelType The comment in the c header of OSMO_GSUP_CANCEL_TYPE_UPDATE says: 1 = /* 0 on the wire */, 2 = /* 1 on the wire */ Change-Id: I4d22af9fee19e6036dbb555422759e3c1285416a --- M library/GSUP_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 0d21404..7680815 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -79,8 +79,8 @@ } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { - OSMO_GSUP_CANCEL_TYPE_UPDATE (1), - OSMO_GSUP_CANCEL_TYPE_WITHDRAW (2) + OSMO_GSUP_CANCEL_TYPE_UPDATE (0), + OSMO_GSUP_CANCEL_TYPE_WITHDRAW (1) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CnDomain { -- To view, visit https://gerrit.osmocom.org/10974 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: I4d22af9fee19e6036dbb555422759e3c1285416a Gerrit-Change-Number: 10974 Gerrit-PatchSet: 1 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 Sun Sep 16 05:17:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:17:36 +0000 Subject: Change in osmo-ggsn[master]: libgtp: implement gtp_clear_queues to clear req/resp queue In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10975 ) Change subject: libgtp: implement gtp_clear_queues to clear req/resp queue ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10975/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10975/1//COMMIT_MSG at 11 PS1, Line 11: packages packets. -- To view, visit https://gerrit.osmocom.org/10975 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: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d Gerrit-Change-Number: 10975 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 05:17:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 05:17:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:17:52 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 16 Sep 2018 05:17:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 05:18:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:18:49 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 1: > Any idea regarding the origianl rationale to put it in sbin? As the original author, I'm sure it was a copy+patte of some other Makefile, without giving it much thought, sorry. -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 16 Sep 2018 05:18:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 05:20:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:20:25 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10698 ) Change subject: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg ...................................................................... Patch Set 4: Code-Review+1 "Received UL Measurement" or the like should be the best option. -- 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: comment Gerrit-Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c Gerrit-Change-Number: 10698 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Sep 2018 05:20: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 Sep 16 05:20:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:20:50 +0000 Subject: Change in osmo-ci[master]: Add building for "mobile" and "virt_phy" as well In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10973 ) Change subject: Add building for "mobile" and "virt_phy" as well ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10973 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: I7b2e6111f8b41219e9b2621be5720b9a738c69de Gerrit-Change-Number: 10973 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 05:20: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 Sep 16 05:21:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:21:10 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add script to build the mobile application In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10971 ) Change subject: build: Add script to build the mobile application ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10971 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: I2c537e56aa982b0b4a703fa78c77ade507738b68 Gerrit-Change-Number: 10971 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 05:21: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 Sep 16 05:21:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:21:54 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add overload to clone repo and build in subdirectory In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10970 ) Change subject: build: Add overload to clone repo and build in subdirectory ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10970 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: I67fbd54296f2c68316bf8e89cfeb37d147193d53 Gerrit-Change-Number: 10970 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 05:21: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 Sep 16 05:27:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Sep 2018 05:27:48 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg 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/10698 to look at the new patch set (#5). 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. Anyway, the purpose of l1if_process_meas_res() is to handle measurements, not 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/5 -- 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: newpatchset Gerrit-Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c Gerrit-Change-Number: 10698 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy 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 Sun Sep 16 05:49:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:49:23 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10698 ) Change subject: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg ...................................................................... Patch Set 5: Code-Review+2 -- 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: comment Gerrit-Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c Gerrit-Change-Number: 10698 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Sep 2018 05:49: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 Sep 16 05:49:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:49:25 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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. Anyway, the purpose of l1if_process_meas_res() is to handle measurements, not frames. Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c --- M src/osmo-bts-trx/l1_if.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 23fc196..2b4f5c8 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 UL measurement for %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: merged Gerrit-Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c Gerrit-Change-Number: 10698 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy 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 Sun Sep 16 05:49:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 05:49:44 +0000 Subject: Change in osmo-gsm-tester[master]: Add script to build virt_phy of OsmocomBB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10972 ) Change subject: Add script to build virt_phy of OsmocomBB ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10972 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: I1f14ce43db2f5e16f94dc975e7496dceb4f4b72a Gerrit-Change-Number: 10972 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 05:49:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 06:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 16 Sep 2018 06:24:58 +0000 Subject: Change in osmo-ggsn[master]: libgtp: implement gtp_clear_queues to clear req/resp queue 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/10975 to look at the new patch set (#2). Change subject: libgtp: implement gtp_clear_queues to clear req/resp queue ...................................................................... libgtp: implement gtp_clear_queues to clear req/resp queue Clearing the request and response queue is useful for debugging to reset "some" state. Otherwise some tests will get un-expected packets. Change-Id: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/75/10975/2 -- To view, visit https://gerrit.osmocom.org/10975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d Gerrit-Change-Number: 10975 Gerrit-PatchSet: 2 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 Sun Sep 16 06:44:04 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 16 Sep 2018 06:44:04 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Install to /bin as it doesn't require special privileges.. This makes packaging the binary for the gsm tester more easy. Change-Id: Ibe572a4c17871785b623e70acc7f5da056f945e5 --- M src/host/virt_phy/src/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/virt_phy/src/Makefile.am b/src/host/virt_phy/src/Makefile.am index 48f9de7..bfd0dfa 100644 --- a/src/host/virt_phy/src/Makefile.am +++ b/src/host/virt_phy/src/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/../layer23/include -sbin_PROGRAMS = virtphy +bin_PROGRAMS = virtphy virtphy_SOURCES = virtphy.c l1ctl_sock.c gsmtapl1_if.c l1ctl_sap.c virt_prim_pm.c virt_prim_fbsb.c virt_prim_rach.c virt_prim_data.c virt_prim_traffic.c virt_l1_sched_simple.c logging.c virt_l1_model.c shared/virtual_um.c shared/osmo_mcast_sock.c virtphy_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) virtphy_LDFLAGS = -pthread -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 06:56:31 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 16 Sep 2018 06:56:31 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 2: > It's actually not easier since we support using adding binaries > from /sbin in there, but it's fine :) Ah I see: create_bin_tgz "" "osmocon" So maybe: create_binary_tgz "bin1 bin2" "sbin1 sbin2" But then we can't have spaces in binary names (yeah why would we) but that is a common problem of shell scripts. Alternatively: create_binary_tgz "bin1" "bin2" "sbin1" "sbin2" This makes it impossible to have an "osmocon" in both bin and sbin but then that would lead to oddities anyway. What do you think? -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 16 Sep 2018 06:56:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 09:59:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Sep 2018 09:59:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS: enable encryption + RLL tests for Lm (TCH/H) channels Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10976 Change subject: BTS: enable encryption + RLL tests for Lm (TCH/H) channels ...................................................................... BTS: enable encryption + RLL tests for Lm (TCH/H) channels Since OS#3419 is resolved and TCH/H channel is supported by trxcon, both encryption and RLL tests can be finally enabled on Lm (TCH/H) channels. Change-Id: I78f82a5f2a7b21d91692b1c99a9ff125e65cab64 Related: OS#3256 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10976/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index bfa8988..0303a49 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -303,7 +303,7 @@ /* TS 1..4: TCH/F */ valueof(ts_RslChanNr_Bm(1)), /* TS 5: TCH/H */ - //valueof(ts_RslChanNr_Lm(5,1)), + valueof(ts_RslChanNr_Lm(5,1)), /* TS 0: SDCCH/4 */ valueof(ts_RslChanNr_SDCCH4(0,2)), /* TS 6: SDCCH/8 */ -- To view, visit https://gerrit.osmocom.org/10976 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: I78f82a5f2a7b21d91692b1c99a9ff125e65cab64 Gerrit-Change-Number: 10976 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:00:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:00:22 +0000 Subject: Change in osmo-sgsn[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/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10284 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: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 16 Sep 2018 10:00:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:29:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:29:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS: enable encryption + RLL tests for Lm (TCH/H) channels In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10976 ) Change subject: BTS: enable encryption + RLL tests for Lm (TCH/H) channels ...................................................................... Patch Set 1: Code-Review+2 great to see this resolved! -- To view, visit https://gerrit.osmocom.org/10976 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: I78f82a5f2a7b21d91692b1c99a9ff125e65cab64 Gerrit-Change-Number: 10976 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 10:29: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 Sep 16 10:29:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:29:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS: enable encryption + RLL tests for Lm (TCH/H) channels In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10976 ) Change subject: BTS: enable encryption + RLL tests for Lm (TCH/H) channels ...................................................................... BTS: enable encryption + RLL tests for Lm (TCH/H) channels Since OS#3419 is resolved and TCH/H channel is supported by trxcon, both encryption and RLL tests can be finally enabled on Lm (TCH/H) channels. Change-Id: I78f82a5f2a7b21d91692b1c99a9ff125e65cab64 Related: OS#3256 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index bfa8988..0303a49 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -303,7 +303,7 @@ /* TS 1..4: TCH/F */ valueof(ts_RslChanNr_Bm(1)), /* TS 5: TCH/H */ - //valueof(ts_RslChanNr_Lm(5,1)), + valueof(ts_RslChanNr_Lm(5,1)), /* TS 0: SDCCH/4 */ valueof(ts_RslChanNr_SDCCH4(0,2)), /* TS 6: SDCCH/8 */ -- To view, visit https://gerrit.osmocom.org/10976 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: I78f82a5f2a7b21d91692b1c99a9ff125e65cab64 Gerrit-Change-Number: 10976 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 16 10:30:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:30:08 +0000 Subject: Change in osmo-ggsn[master]: libgtp: implement gtp_clear_queues to clear req/resp queue In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10975 ) Change subject: libgtp: implement gtp_clear_queues to clear req/resp queue ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10975 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: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d Gerrit-Change-Number: 10975 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 10:30:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:30:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:30:10 +0000 Subject: Change in osmo-ggsn[master]: libgtp: implement gtp_clear_queues to clear req/resp queue In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10975 ) Change subject: libgtp: implement gtp_clear_queues to clear req/resp queue ...................................................................... libgtp: implement gtp_clear_queues to clear req/resp queue Clearing the request and response queue is useful for debugging to reset "some" state. Otherwise some tests will get un-expected packets. Change-Id: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/gtp/gtp.c b/gtp/gtp.c index 1d58088..b98fba0 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -496,6 +496,24 @@ return 0; } + +/** + * @brief clear the request and response queue. Useful for debugging to reset "some" state. + * @param gsn The GGSN instance + */ +void gtp_clear_queues(struct gsn_t *gsn) +{ + struct qmsg_t *qmsg; + + while (!queue_getfirst(gsn->queue_req, &qmsg)) { + queue_freemsg(gsn->queue_req, qmsg); + } + + while (!queue_getfirst(gsn->queue_resp, &qmsg)) { + queue_freemsg(gsn->queue_resp, qmsg); + } +} + /* gtp_conf * Remove signalling packet from retransmission queue. * return 0 on success, EOF if packet was not found */ diff --git a/gtp/gtp.h b/gtp/gtp.h index ed594f1..5f35ab5 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -369,6 +369,8 @@ struct pdp_t * pdp, uint8_t recovery)); +void gtp_clear_queues(struct gsn_t *gsn); + /* Internal functions (not part of the API */ extern int gtp_echo_req(struct gsn_t *gsn, int version, void *cbp, -- To view, visit https://gerrit.osmocom.org/10975 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: I279d1d7cbf5d37dd5609c2b968f317fe9a0e348d Gerrit-Change-Number: 10975 Gerrit-PatchSet: 3 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 Sun Sep 16 10:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:37:54 +0000 Subject: Change in osmo-bts[master]: lc15: vty: Add missing include for lchan_deactivate In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9532 ) Change subject: lc15: vty: Add missing include for lchan_deactivate ...................................................................... lc15: vty: Add missing include for lchan_deactivate Fixes following compilation warning: osmo-bts/src/osmo-bts-litecell15/lc15bts_vty.c:244:3: warning: implicit declaration of function ?lchan_deactivate? Change-Id: Id9b144d068d53393e1c1887aad285ae757156ec6 --- M src/osmo-bts-litecell15/lc15bts_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-litecell15/lc15bts_vty.c b/src/osmo-bts-litecell15/lc15bts_vty.c index 46f73ab..d0edc88 100644 --- a/src/osmo-bts-litecell15/lc15bts_vty.c +++ b/src/osmo-bts-litecell15/lc15bts_vty.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "lc15bts.h" #include "l1_if.h" -- To view, visit https://gerrit.osmocom.org/9532 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: Id9b144d068d53393e1c1887aad285ae757156ec6 Gerrit-Change-Number: 9532 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 Sun Sep 16 10:40:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:40:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add ttcn3 test suites slides from OsmoDevCon 2018 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10709 to look at the new patch set (#2). 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/2 -- 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: newpatchset Gerrit-Change-Id: I8a0d66babc165678ec53a1ee1c673e93708b8b79 Gerrit-Change-Number: 10709 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:42:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:42:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add ttcn3 test suites slides from OsmoDevCon 2018 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10709 ) Change subject: add ttcn3 test suites slides from OsmoDevCon 2018 ...................................................................... Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Sep 2018 10:42: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 Sep 16 10:42:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:42:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add ttcn3 test suites slides from OsmoDevCon 2018 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/osmodevcon2018-ttcn3_test_suites.adoc b/doc/osmodevcon2018-ttcn3_test_suites.adoc new file mode 100644 index 0000000..6eaee82 --- /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 (emulates 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: merged Gerrit-Change-Id: I8a0d66babc165678ec53a1ee1c673e93708b8b79 Gerrit-Change-Number: 10709 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: update TODO comments; remove tests already covered Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10977 Change subject: bts: update TODO comments; remove tests already covered ...................................................................... bts: update TODO comments; remove tests already covered Change-Id: I35003e20b9b511e5d514549a9ad0acc32b243651 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/10977/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0303a49..963a38d 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4089,13 +4089,11 @@ * MS Power Control * BS Power Control * Physical Context -* SACCH info modify -* CCCH Load Indication for PCH and RACH -* Delete Indication on AGCH overflow +* CCCH Load Indication for RACH * SMS Broadcast Req / Cmd / CBCH LOad Ind * RF resource ind * error handling -* discriminator error +** discriminator error ** type error ** sequence error ** IE duplicated? -- To view, visit https://gerrit.osmocom.org/10977 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: I35003e20b9b511e5d514549a9ad0acc32b243651 Gerrit-Change-Number: 10977 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_VTY_Functions: Generalize to handle multiple VTY ports Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10978 Change subject: Osmocom_VTY_Functions: Generalize to handle multiple VTY ports ...................................................................... Osmocom_VTY_Functions: Generalize to handle multiple VTY ports The existing Osmocom_VTY_Functions code was centered around a global module parameter specifying the prompt prefix. This prevented a single test to use multiple VTY connections to different Osmocom programs. This patch generalize the code by widening the prompt matching in f_vty_wait_for_prompt() and by allowing the caller to specify the prompt prefix to override the modulepar. Change-Id: I574b56c42fe95540af44a2c43d0fb469938c0e65 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/10978/1 diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 427bd5c..b822645 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -12,24 +12,24 @@ template charstring t_vty_unknown := pattern "*% Unknown command."; /* configure prompts in TELNETasp module */ - function f_vty_set_prompts(TELNETasp_PT pt) { + function f_vty_set_prompts(TELNETasp_PT pt, charstring prompt_prefix := mp_prompt_prefix) { var ASP_TelnetDynamicConfig vty_prompt[3] := { { prompt := { id := 1, - prompt := mp_prompt_prefix & VTY_VIEW_SUFFIX, + prompt := prompt_prefix & VTY_VIEW_SUFFIX, has_wildcards := false } }, { prompt := { id := 2, - prompt := mp_prompt_prefix & VTY_ENABLE_SUFFIX, + prompt := prompt_prefix & VTY_ENABLE_SUFFIX, has_wildcards := false } }, { prompt := { id := 3, - prompt := mp_prompt_prefix & VTY_CFG_SUFFIX, + prompt := prompt_prefix & VTY_CFG_SUFFIX, has_wildcards := true } } @@ -51,9 +51,9 @@ T.start; alt { - [] pt.receive(mp_prompt_prefix & VTY_VIEW_SUFFIX) { }; - [] pt.receive(mp_prompt_prefix & VTY_ENABLE_SUFFIX) { }; - [] pt.receive(pattern mp_prompt_prefix & VTY_CFG_SUFFIX) { }; + [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { }; + [] pt.receive(pattern "\w+\# ") { }; + [] pt.receive(pattern "\w+" & VTY_CFG_SUFFIX) { }; [] pt.receive(t_vty_unknown) { testcase.stop(fail, "VTY: Unknown Command"); }; -- To view, visit https://gerrit.osmocom.org/10978 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: I574b56c42fe95540af44a2c43d0fb469938c0e65 Gerrit-Change-Number: 10978 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10979 Change subject: bts: Add second VTY connection to BSC ...................................................................... bts: Add second VTY connection to BSC Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a --- M bts/BTS_Tests.cfg M bts/BTS_Tests.default M bts/BTS_Tests.ttcn 3 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/10979/1 diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg index 58eed2c..d365a06 100644 --- a/bts/BTS_Tests.cfg +++ b/bts/BTS_Tests.cfg @@ -13,6 +13,7 @@ #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau #*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home *.BTSVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bts-trx +*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bsc [MODULE_PARAMETERS] #BTS_Tests.mp_rsl_ip := "10.9.1.2" # office diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index f254993..920f5d0 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -14,6 +14,17 @@ *.BTSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.BTSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.BTSVTY.PROMPT1 := "OsmoBTS> " + +*.BSCVTY.CTRL_MODE := "client" +*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" +*.BSCVTY.CTRL_PORTNUM := "4242" +*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes" +*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.BSCVTY.CTRL_READMODE := "buffered" +*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.BSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.BSCVTY.PROMPT1 := "OsmoBSC> " + *.PCU.socket_type := "SEQPACKET" [MODULE_PARAMETERS] diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 963a38d..aa402d1 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -75,7 +75,9 @@ port TRXC_CODEC_PT BB_TRXC; var integer g_bb_trxc_conn_id; + /* VTY connections to both BTS and BSC */ port TELNETasp_PT BTSVTY; + port TELNETasp_PT BSCVTY; /* PCU Interface of BTS */ port PCUIF_CODEC_PT PCU; @@ -248,6 +250,12 @@ f_vty_transceive(BTSVTY, "enable"); } +private function f_init_vty_bsc() runs on test_CT { + map(self:BSCVTY, system:BSCVTY); + f_vty_set_prompts(BSCVTY, "OsmoBSC"); + f_vty_transceive(BSCVTY, "enable"); +} + /* PCU socket may at any time receive a new INFO.ind */ private altstep as_pcu_info_ind(PCUIF_CODEC_PT pt, integer pcu_conn_id, out PCUIF_Message pcu_last_info) { -- To view, visit https://gerrit.osmocom.org/10979 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: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a Gerrit-Change-Number: 10979 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: rsl: Add SMSCB related RSL types / templates Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10980 Change subject: rsl: Add SMSCB related RSL types / templates ...................................................................... rsl: Add SMSCB related RSL types / templates Change-Id: I203e72a203ffa7538aadc7b96e1ae7e21956c160 --- M library/RSL_Types.ttcn 1 file changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/10980/1 diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 95a7b1f..7992132 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -577,6 +577,28 @@ RSL_ChanNeeded chan_needed } + /* 9.3.41 CB Command Type */ + type enumerated RSL_CbCommand { + RSL_CB_CMD_NORMAL ('0000'B), + RSL_CB_CMD_SCHEDULE ('1000'B), + RSL_CB_CMD_DEFAULT ('1110'B), + RSL_CB_CMD_NULL ('1111'B) + } with { variant "FIELDLENGTH(4)" }; + type record RSL_IE_CbCommandType { + RSL_CbCommand command, + boolean default_bcast_null, + BIT1 spare, + uint2_t last_block + }; + template (value) RSL_IE_CbCommandType ts_RSL_IE_CbCmdType(RSL_CbCommand cmd := RSL_CB_CMD_NORMAL, + uint2_t last_block := 1, + boolean def_bcast_null := true) := { + command := cmd, + default_bcast_null := def_bcast_null, + spare := '0'B, + last_block := last_block + } + /* 9.3.53 */ type record RSL_IE_MultirateCtrl { uint3_t spare, @@ -678,6 +700,9 @@ uint16_t paging_load, uint8_t paging_group, RSL_IE_ChanNeeded chan_needed, + RSL_IE_CbCommandType cb_cmd_type, + RSL_LV smscb_message, + RSL_IE_StartingTime starting_time, RSL_IE_EncryptionInfo encr_info, RSL_IE_RequestRef req_ref, @@ -726,6 +751,8 @@ paging_load, iei = RSL_IE_PAGING_LOAD; paging_group, iei = RSL_IE_PAGING_GROUP; chan_needed, iei = RSL_IE_CHAN_NEEDED; + cb_cmd_type, iei = RSL_IE_CB_CMD_TYPE; + smscb_message, iei = RSL_IE_SMSCB_MSG; starting_time, iei = RSL_IE_STARTNG_TIME; encr_info, iei = RSL_IE_ENCR_INFO; @@ -1467,6 +1494,33 @@ ies := * } + /* 8.5.8 BTS <- BSC SMS BROADCAST COMMAND */ + template RSL_Message tr_RSL_SMSCB_CMD(template RSL_IE_CbCommandType cb_cmd := ?, + template octetstring msg := ?, + template RslChannelNr chan_nr := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_SMS_BC_CMD, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{cb_cmd_type := cb_cmd}), + tr_RSL_IE(RSL_IE_Body:{smscb_message := tr_RSL_LV(msg)}), + * + } + } + template (value) RSL_Message ts_RSL_SMSCB_CMD(template (value) RSL_IE_CbCommandType cb_cmd, + template (value) octetstring msg, + template (value) RslChannelNr chan_nr := + ts_RslChanNr_SDCCH4(0, 2)) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_SMS_BC_CMD, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + t_RSL_IE(RSL_IE_CB_CMD_TYPE, RSL_IE_Body:{cb_cmd_type := cb_cmd}), + t_RSL_IE(RSL_IE_SMSCB_MSG, RSL_IE_Body:{smscb_message := ts_RSL_LV(msg)}) + /* optional channel type for extended CBCH */ + } + } + /* 8.6.2 BTS <- BSC */ template (value) RSL_Message ts_RSL_SACCH_FILL(RSL_IE_SysinfoType si_type, octetstring l3_info) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_TRX_MGMT, false), -- To view, visit https://gerrit.osmocom.org/10980 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: I203e72a203ffa7538aadc7b96e1ae7e21956c160 Gerrit-Change-Number: 10980 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Add support for Osmocom RSL ChannelNr CBCH Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10981 Change subject: GSM_Types: Add support for Osmocom RSL ChannelNr CBCH ...................................................................... GSM_Types: Add support for Osmocom RSL ChannelNr CBCH Osmocom uses 0xC8 as channel number for CBCH, this is an extension to the 08.58 definitions. Change-Id: I2203f4a9012c154c12ac9d8f9c448a9ed0f49197 --- M library/GSM_Types.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/10981/1 diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 59ccb76..53208e5 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -60,7 +60,8 @@ RSL_CHAN_NR_BCCH ('10000'B), RSL_CHAN_NR_RACH ('10001'B), RSL_CHAN_NR_PCH_AGCH ('10010'B), - RSL_CHAN_NR_OSMO_PDCH ('11000'B) + RSL_CHAN_NR_OSMO_PDCH ('11000'B), + RSL_CHAN_NR_OSMO_CBCH ('11001'B) } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; type record RslChanNr2 { @@ -107,6 +108,7 @@ template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); + template RslChannelNr t_RslChanNr_CBCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH); template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := { u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, tn := tn @@ -129,6 +131,7 @@ template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); + template (value) RslChannelNr ts_RslChanNr_CBCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH); template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := { u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, tn := tn -- To view, visit https://gerrit.osmocom.org/10981 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: I2203f4a9012c154c12ac9d8f9c448a9ed0f49197 Gerrit-Change-Number: 10981 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: update TODO comments; remove tests already covered In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10977 ) Change subject: bts: update TODO comments; remove tests already covered ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10977 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: I35003e20b9b511e5d514549a9ad0acc32b243651 Gerrit-Change-Number: 10977 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 10:43:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:43:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_VTY_Functions: Generalize to handle multiple VTY ports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10978 ) Change subject: Osmocom_VTY_Functions: Generalize to handle multiple VTY ports ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10978 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: I574b56c42fe95540af44a2c43d0fb469938c0e65 Gerrit-Change-Number: 10978 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 10:43: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 Sep 16 10:44:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:44:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10979 ) Change subject: bts: Add second VTY connection to BSC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10979 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: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a Gerrit-Change-Number: 10979 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 10:44: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 Sep 16 10:44:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:44:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10979 ) Change subject: bts: Add second VTY connection to BSC ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10979 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: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a Gerrit-Change-Number: 10979 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 10:44:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:44:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:44:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: rsl: Add SMSCB related RSL types / templates In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10980 ) Change subject: rsl: Add SMSCB related RSL types / templates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10980 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: I203e72a203ffa7538aadc7b96e1ae7e21956c160 Gerrit-Change-Number: 10980 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 10:44:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:44:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:44:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Add support for Osmocom RSL ChannelNr CBCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10981 ) Change subject: GSM_Types: Add support for Osmocom RSL ChannelNr CBCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10981 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: I2203f4a9012c154c12ac9d8f9c448a9ed0f49197 Gerrit-Change-Number: 10981 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 10:44:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 10:44:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:44:55 +0000 Subject: Change in osmo-bts[master]: lc15: fsync requires fd instead of file stream In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9535 ) Change subject: lc15: fsync requires fd instead of file stream ...................................................................... lc15: fsync requires fd instead of file stream Change-Id: I7efb7280363b3a021b30c3b4eacb3aab70e9c8da --- M src/osmo-bts-litecell15/misc/lc15bts_par.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.c b/src/osmo-bts-litecell15/misc/lc15bts_par.c index 75314a4..af9d030 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.c @@ -144,7 +144,7 @@ return -EIO; } - fsync(fp); + fsync(fileno(fp)); fclose(fp); return 0; } @@ -176,7 +176,7 @@ rc = fwrite(buf, 1, size, fp); - fsync(fp); + fsync(fileno(fp)); fclose(fp); return rc; @@ -225,7 +225,7 @@ fclose(fp); return -EIO; } - fsync(fp); + fsync(fileno(fp)); fclose(fp); return 0; -- To view, visit https://gerrit.osmocom.org/9535 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: I7efb7280363b3a021b30c3b4eacb3aab70e9c8da Gerrit-Change-Number: 9535 Gerrit-PatchSet: 3 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 Sun Sep 16 10:45:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 10:45:01 +0000 Subject: Change in osmo-bts[master]: lc15: rewrite and refactor code to print hwversion description In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9533 ) Change subject: lc15: rewrite and refactor code to print hwversion description ...................................................................... lc15: rewrite and refactor code to print hwversion description Also print a newline at the end of print_hwversion(). In the process of rewrite, fix several warnings in the few lines of this functions: osmo-bts/src/osmo-bts-litecell15/main.c: In function ?print_hwversion?: osmo-bts/src/osmo-bts-litecell15/main.c:162:12: warning: passing argument 1 to restrict-qualified parameter aliases with argument 4 [-Wrestrict] snprintf(model_name, sizeof(model_name), "%s Rev %c", ^~~~~~~~~~ model_name, (char)rev); ~~~~~~~~~~ osmo-bts/src/osmo-bts-litecell15/main.c:168:12: warning: passing argument 1 to restrict-qualified parameter aliases with argument 4 [-Wrestrict] snprintf(model_name, sizeof(model_name), "%s (%05X)", ^~~~~~~~~~ model_name, model); ~~~~~~~~~~ osmo-bts/src/osmo-bts-litecell15/main.c:162:47: warning: ? Rev ? directive output may be truncated writing 5 bytes into a region of size between 1 and 64 [-Wformat-truncation=] snprintf(model_name, sizeof(model_name), "%s Rev %c", ^~~~~ osmo-bts/src/osmo-bts-litecell15/main.c:162:3: note: ?snprintf? output between 7 and 70 bytes into a destination of size 64 snprintf(model_name, sizeof(model_name), "%s Rev %c", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ model_name, (char)rev); ~~~~~~~~~~~~~~~~~~~~~~ osmo-bts/src/osmo-bts-litecell15/main.c:168:47: warning: ? (? directive output may be truncated writing 2 bytes into a region of size between 1 and 64 [-Wformat-truncation=] snprintf(model_name, sizeof(model_name), "%s (%05X)", ^~ osmo-bts/src/osmo-bts-litecell15/main.c:168:44: note: using the range [0, 4294967295] for directive argument snprintf(model_name, sizeof(model_name), "%s (%05X)", ^~~~~~~~~~~ osmo-bts/src/osmo-bts-litecell15/main.c:168:3: note: ?snprintf? output between 9 and 75 bytes into a destination of size 64 snprintf(model_name, sizeof(model_name), "%s (%05X)", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ model_name, model); ~~~~~~~~~~~~~~~~~~ Change-Id: I079b056a04fe77d2f7f361ff5899232cb70b5a93 --- M src/osmo-bts-litecell15/main.c M src/osmo-bts-litecell15/misc/lc15bts_bid.c M src/osmo-bts-litecell15/misc/lc15bts_bid.h M src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c 4 files changed, 26 insertions(+), 35 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index 030c3ef..de175e3 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -151,25 +151,8 @@ static void print_hwversion() { - int rev; - int model; - static char model_name[64] = {0, }; - - snprintf(model_name, sizeof(model_name), "NuRAN Litecell 1.5 BTS"); - - rev = lc15bts_rev_get(); - if (rev >= 0) { - snprintf(model_name, sizeof(model_name), "%s Rev %c", - model_name, (char)rev); - } - - model = lc15bts_model_get(); - if (model >= 0) { - snprintf(model_name, sizeof(model_name), "%s (%05X)", - model_name, model); - } - - printf(model_name); + printf(get_hwversion_desc()); + printf("\n"); } int bts_model_handle_options(int argc, char **argv) diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index 7f278bf..9284b62 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -138,3 +138,25 @@ return option; } + +const char* get_hwversion_desc() +{ + int rev; + int model; + size_t len; + static char model_name[64] = {0, }; + len = snprintf(model_name, sizeof(model_name), "NuRAN Litecell 1.5 BTS"); + + rev = lc15bts_rev_get(); + if (rev >= 0) { + len += snprintf(model_name + len, sizeof(model_name) - len, + " Rev %c", (char)rev); + } + + model = lc15bts_model_get(); + if (model >= 0) { + snprintf(model_name + len, sizeof(model_name) - len, + "%s (%05X)", model_name, model); + } + return model_name; +} diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.h b/src/osmo-bts-litecell15/misc/lc15bts_bid.h index b320e11..a71fdd7 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.h +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.h @@ -47,5 +47,6 @@ int lc15bts_rev_get(void); int lc15bts_model_get(void); int lc15bts_option_get(enum lc15bts_option_type type); +const char* get_hwversion_desc(); #endif diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c index 549c179..3a617dd 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c @@ -104,8 +104,6 @@ if (!fetched_info) { int fd_eth; int serno; - int model; - int rev; /* fetch the MAC */ fd_eth = open(ETH0_ADDR_SYSFS, O_RDONLY); @@ -119,20 +117,7 @@ lc15bts_par_get_int(tall_mgr_ctx, LC15BTS_PAR_SERNR, &serno); snprintf(ser_str, sizeof(ser_str), "%d", serno); - /* fetch the model and trx number */ - snprintf(model_name, sizeof(model_name), "Litecell 1.5 BTS"); - - rev = lc15bts_rev_get(); - if (rev >= 0) { - snprintf(model_name, sizeof(model_name), "%s Rev %c", - model_name, rev); - } - - model = lc15bts_model_get(); - if (model >= 0) { - snprintf(model_name, sizeof(model_name), "%s (%05X)", - model_name, model); - } + strncpy(model_name, get_hwversion_desc(), sizeof(model_name)-1); fetched_info = 1; } -- To view, visit https://gerrit.osmocom.org/9533 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: I079b056a04fe77d2f7f361ff5899232cb70b5a93 Gerrit-Change-Number: 9533 Gerrit-PatchSet: 3 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 Sun Sep 16 11:18:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Sep 2018 11:18:15 +0000 Subject: Change in osmocom-bb[master]: Add includes so the file can be included by itself In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10968 ) Change subject: Add includes so the file can be included by itself ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10968 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: I05b5f689f389b89deb5ff49507486b246111fc59 Gerrit-Change-Number: 10968 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Sep 2018 11:18:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 11:47:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 11:47:31 +0000 Subject: Change in osmocom-bb[master]: Add includes so the file can be included by itself In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10968 ) Change subject: Add includes so the file can be included by itself ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10968 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: I05b5f689f389b89deb5ff49507486b246111fc59 Gerrit-Change-Number: 10968 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Sep 2018 11:47:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 11:48:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 11:48:02 +0000 Subject: Change in osmocom-bb[master]: lua: Expose API to trigger a network reselection In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10688 ) Change subject: lua: Expose API to trigger a network reselection ...................................................................... Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Sep 2018 11:48:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 13:51:30 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 16 Sep 2018 13:51:30 +0000 Subject: Change in osmocom-bb[master]: Add includes so the file can be included by itself In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10968 ) Change subject: Add includes so the file can be included by itself ...................................................................... Add includes so the file can be included by itself Add missing dependencies to make this file be includeable as the only file. Change-Id: I05b5f689f389b89deb5ff49507486b246111fc59 --- M src/host/layer23/include/osmocom/bb/mobile/gsm322.h 1 file changed, 5 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/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 -- To view, visit https://gerrit.osmocom.org/10968 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: I05b5f689f389b89deb5ff49507486b246111fc59 Gerrit-Change-Number: 10968 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther 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 Sun Sep 16 13:51:31 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 16 Sep 2018 13:51:31 +0000 Subject: Change in osmocom-bb[master]: lua: Expose API to trigger a network reselection In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( 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/primitives.h M src/host/layer23/src/mobile/primitives.c M src/host/layer23/src/mobile/script_lua.c 3 files changed, 27 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified 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: merged Gerrit-Change-Id: I096233a2ca9dd7daa358cebed0523cb8c0dbf593 Gerrit-Change-Number: 10688 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 16 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 16 Sep 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_#248?= In-Reply-To: <694799733.127.1537024206614.JavaMail.jenkins@jenkins.osmocom.org> References: <694799733.127.1537024206614.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1820032831.137.1537110606546.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_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_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_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_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 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 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_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_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 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 admin at opensuse.org Sun Sep 16 19:56:27 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:56:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9eb578a7644_4c4de8c68c760371@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 90s] No package 'libpcsclite' found [ 90s] simtrace2-remsim.o: In function `main': [ 90s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 90s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 90s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 90s] apdu_dispatch.o: In function `apdu_segment_in': [ 90s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 90s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 90s] collect2: error: ld returned 1 exit status [ 90s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 90s] make[2]: *** [simtrace2-remsim] Error 1 [ 90s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 90s] Makefile:20: recipe for target 'utils' failed [ 90s] make[1]: *** [utils] Error 2 [ 90s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 90s] dh_auto_build: make -j1 returned exit code 2 [ 90s] debian/rules:4: recipe for target 'build' failed [ 90s] make: *** [build] Error 2 [ 90s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 90s] [ 90s] build78 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:56:11 UTC 2018. [ 90s] [ 90s] ### VM INTERACTION START ### [ 93s] [ 85.962610] sysrq: SysRq : Power Off [ 93s] [ 85.964439] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] build78 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:56:15 UTC 2018. [ 94s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:56:44 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:56:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9eb59522d5e_4c4de8c68c7604af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 104s] No package 'libpcsclite' found [ 104s] simtrace2-remsim.o: In function `main': [ 104s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 104s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 104s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 104s] apdu_dispatch.o: In function `apdu_segment_in': [ 104s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 104s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 104s] collect2: error: ld returned 1 exit status [ 104s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 104s] make[2]: *** [simtrace2-remsim] Error 1 [ 104s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 104s] Makefile:20: recipe for target 'utils' failed [ 104s] make[1]: *** [utils] Error 2 [ 104s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 104s] dh_auto_build: make -j1 returned exit code 2 [ 104s] debian/rules:4: recipe for target 'build' failed [ 104s] make: *** [build] Error 2 [ 104s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 104s] [ 104s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:56:25 UTC 2018. [ 104s] [ 104s] ### VM INTERACTION START ### [ 107s] [ 99.473115] sysrq: SysRq : Power Off [ 107s] [ 99.478814] reboot: Power down [ 107s] ### VM INTERACTION END ### [ 107s] [ 107s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:56:28 UTC 2018. [ 107s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:57:18 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:57:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9eb5b42a217_4c4de8c68c7605a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 135s] No package 'libpcsclite' found [ 135s] simtrace2-remsim.o: In function `main': [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 135s] apdu_dispatch.o: In function `apdu_segment_in': [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 135s] collect2: error: ld returned 1 exit status [ 135s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 135s] make[2]: *** [simtrace2-remsim] Error 1 [ 135s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 135s] Makefile:20: recipe for target 'utils' failed [ 135s] make[1]: *** [utils] Error 2 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] dh_auto_build: make -j1 returned exit code 2 [ 135s] debian/rules:4: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] lamb27 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:56:58 UTC 2018. [ 135s] [ 135s] ### VM INTERACTION START ### [ 138s] [ 127.569525] sysrq: SysRq : Power Off [ 138s] [ 127.574435] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb27 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:01 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:57:36 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:57:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9eb5b5761ce_4c4de8c68c760644@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 162s] No package 'libpcsclite' found [ 163s] simtrace2-remsim.o: In function `main': [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 163s] apdu_dispatch.o: In function `apdu_segment_in': [ 163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 163s] collect2: error: ld returned 1 exit status [ 163s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 163s] make[2]: *** [simtrace2-remsim] Error 1 [ 163s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 163s] Makefile:20: recipe for target 'utils' failed [ 163s] make[1]: *** [utils] Error 2 [ 163s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 163s] dh_auto_build: make -j1 returned exit code 2 [ 163s] debian/rules:4: recipe for target 'build' failed [ 163s] make: *** [build] Error 2 [ 163s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 163s] [ 163s] lamb02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:20 UTC 2018. [ 163s] [ 163s] ### VM INTERACTION START ### [ 166s] [ 154.735511] sysrq: SysRq : Power Off [ 166s] [ 154.742524] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] lamb02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:24 UTC 2018. [ 166s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:57:53 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:57:53 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9eb5cee8d66_4c4de8c68c7607d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 174s] No package 'libpcsclite' found [ 174s] simtrace2-remsim.o: In function `main': [ 174s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 174s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 174s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 174s] apdu_dispatch.o: In function `apdu_segment_in': [ 174s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 174s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 174s] collect2: error: ld returned 1 exit status [ 174s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 174s] make[2]: *** [simtrace2-remsim] Error 1 [ 174s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 174s] Makefile:20: recipe for target 'utils' failed [ 174s] make[1]: *** [utils] Error 2 [ 174s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 174s] dh_auto_build: make -j1 returned exit code 2 [ 174s] debian/rules:4: recipe for target 'build' failed [ 174s] make: *** [build] Error 2 [ 174s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 174s] [ 174s] cloud109 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:32 UTC 2018. [ 174s] [ 174s] ### VM INTERACTION START ### [ 177s] [ 153.481632] sysrq: SysRq : Power Off [ 177s] [ 153.498524] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] cloud109 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:38 UTC 2018. [ 179s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:57:53 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:57:53 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9eb5cf4a1e7_4c4de8c68c7608d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb07 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:35 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 128.785855] sysrq: SysRq : Power Off [ 139s] [ 128.792893] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb07 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:39 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:57:53 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:57:53 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9eb5d09cfc_4c4de8c68c76109a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 184s] No package 'libpcsclite' found [ 184s] simtrace2-remsim.o: In function `main': [ 184s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 184s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 184s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 184s] apdu_dispatch.o: In function `apdu_segment_in': [ 184s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 184s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 184s] collect2: error: ld returned 1 exit status [ 184s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 184s] make[2]: *** [simtrace2-remsim] Error 1 [ 184s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 184s] Makefile:20: recipe for target 'utils' failed [ 184s] make[1]: *** [utils] Error 2 [ 184s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 184s] dh_auto_build: make -j1 returned exit code 2 [ 184s] debian/rules:4: recipe for target 'build' failed [ 184s] make: *** [build] Error 2 [ 184s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 184s] [ 184s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:40 UTC 2018. [ 184s] [ 184s] ### VM INTERACTION START ### [ 187s] [ 161.099420] sysrq: SysRq : Power Off [ 187s] [ 161.109023] reboot: Power down [ 188s] ### VM INTERACTION END ### [ 188s] [ 188s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:44 UTC 2018. [ 188s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 16 19:58:10 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 19:58:10 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9eb5eea87cf_4c4de8c68c7611c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 141s] No package 'libpcsclite' found [ 141s] simtrace2-remsim.o: In function `main': [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 141s] apdu_dispatch.o: In function `apdu_segment_in': [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 141s] collect2: error: ld returned 1 exit status [ 141s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 141s] make[2]: *** [simtrace2-remsim] Error 1 [ 141s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 141s] Makefile:20: recipe for target 'utils' failed [ 141s] make[1]: *** [utils] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] dh_auto_build: make -j1 returned exit code 2 [ 141s] debian/rules:4: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 141s] [ 141s] lamb11 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:51 UTC 2018. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 132.324374] sysrq: SysRq : Power Off [ 144s] [ 132.332115] reboot: Power down [ 144s] ### VM INTERACTION END ### [ 144s] [ 144s] lamb11 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 19:57:55 UTC 2018. [ 144s] -- 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 Sep 16 20:02:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: update TODO comments; remove tests already covered In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10977 ) Change subject: bts: update TODO comments; remove tests already covered ...................................................................... bts: update TODO comments; remove tests already covered Change-Id: I35003e20b9b511e5d514549a9ad0acc32b243651 --- M bts/BTS_Tests.ttcn 1 file changed, 2 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 0303a49..963a38d 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4089,13 +4089,11 @@ * MS Power Control * BS Power Control * Physical Context -* SACCH info modify -* CCCH Load Indication for PCH and RACH -* Delete Indication on AGCH overflow +* CCCH Load Indication for RACH * SMS Broadcast Req / Cmd / CBCH LOad Ind * RF resource ind * error handling -* discriminator error +** discriminator error ** type error ** sequence error ** IE duplicated? -- To view, visit https://gerrit.osmocom.org/10977 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: I35003e20b9b511e5d514549a9ad0acc32b243651 Gerrit-Change-Number: 10977 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 Sep 16 20:02:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_VTY_Functions: Generalize to handle multiple VTY ports In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10978 ) Change subject: Osmocom_VTY_Functions: Generalize to handle multiple VTY ports ...................................................................... Osmocom_VTY_Functions: Generalize to handle multiple VTY ports The existing Osmocom_VTY_Functions code was centered around a global module parameter specifying the prompt prefix. This prevented a single test to use multiple VTY connections to different Osmocom programs. This patch generalize the code by widening the prompt matching in f_vty_wait_for_prompt() and by allowing the caller to specify the prompt prefix to override the modulepar. Change-Id: I574b56c42fe95540af44a2c43d0fb469938c0e65 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 427bd5c..b822645 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -12,24 +12,24 @@ template charstring t_vty_unknown := pattern "*% Unknown command."; /* configure prompts in TELNETasp module */ - function f_vty_set_prompts(TELNETasp_PT pt) { + function f_vty_set_prompts(TELNETasp_PT pt, charstring prompt_prefix := mp_prompt_prefix) { var ASP_TelnetDynamicConfig vty_prompt[3] := { { prompt := { id := 1, - prompt := mp_prompt_prefix & VTY_VIEW_SUFFIX, + prompt := prompt_prefix & VTY_VIEW_SUFFIX, has_wildcards := false } }, { prompt := { id := 2, - prompt := mp_prompt_prefix & VTY_ENABLE_SUFFIX, + prompt := prompt_prefix & VTY_ENABLE_SUFFIX, has_wildcards := false } }, { prompt := { id := 3, - prompt := mp_prompt_prefix & VTY_CFG_SUFFIX, + prompt := prompt_prefix & VTY_CFG_SUFFIX, has_wildcards := true } } @@ -51,9 +51,9 @@ T.start; alt { - [] pt.receive(mp_prompt_prefix & VTY_VIEW_SUFFIX) { }; - [] pt.receive(mp_prompt_prefix & VTY_ENABLE_SUFFIX) { }; - [] pt.receive(pattern mp_prompt_prefix & VTY_CFG_SUFFIX) { }; + [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { }; + [] pt.receive(pattern "\w+\# ") { }; + [] pt.receive(pattern "\w+" & VTY_CFG_SUFFIX) { }; [] pt.receive(t_vty_unknown) { testcase.stop(fail, "VTY: Unknown Command"); }; -- To view, visit https://gerrit.osmocom.org/10978 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: I574b56c42fe95540af44a2c43d0fb469938c0e65 Gerrit-Change-Number: 10978 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 Sep 16 20:02:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10979 ) Change subject: bts: Add second VTY connection to BSC ...................................................................... bts: Add second VTY connection to BSC Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a --- M bts/BTS_Tests.cfg M bts/BTS_Tests.default M bts/BTS_Tests.ttcn 3 files changed, 20 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg index 58eed2c..d365a06 100644 --- a/bts/BTS_Tests.cfg +++ b/bts/BTS_Tests.cfg @@ -13,6 +13,7 @@ #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau #*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home *.BTSVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bts-trx +*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bsc [MODULE_PARAMETERS] #BTS_Tests.mp_rsl_ip := "10.9.1.2" # office diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index f254993..920f5d0 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -14,6 +14,17 @@ *.BTSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.BTSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.BTSVTY.PROMPT1 := "OsmoBTS> " + +*.BSCVTY.CTRL_MODE := "client" +*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" +*.BSCVTY.CTRL_PORTNUM := "4242" +*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes" +*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.BSCVTY.CTRL_READMODE := "buffered" +*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.BSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.BSCVTY.PROMPT1 := "OsmoBSC> " + *.PCU.socket_type := "SEQPACKET" [MODULE_PARAMETERS] diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 963a38d..aa402d1 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -75,7 +75,9 @@ port TRXC_CODEC_PT BB_TRXC; var integer g_bb_trxc_conn_id; + /* VTY connections to both BTS and BSC */ port TELNETasp_PT BTSVTY; + port TELNETasp_PT BSCVTY; /* PCU Interface of BTS */ port PCUIF_CODEC_PT PCU; @@ -248,6 +250,12 @@ f_vty_transceive(BTSVTY, "enable"); } +private function f_init_vty_bsc() runs on test_CT { + map(self:BSCVTY, system:BSCVTY); + f_vty_set_prompts(BSCVTY, "OsmoBSC"); + f_vty_transceive(BSCVTY, "enable"); +} + /* PCU socket may at any time receive a new INFO.ind */ private altstep as_pcu_info_ind(PCUIF_CODEC_PT pt, integer pcu_conn_id, out PCUIF_Message pcu_last_info) { -- To view, visit https://gerrit.osmocom.org/10979 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: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a Gerrit-Change-Number: 10979 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 Sep 16 20:02:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: rsl: Add SMSCB related RSL types / templates In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10980 ) Change subject: rsl: Add SMSCB related RSL types / templates ...................................................................... rsl: Add SMSCB related RSL types / templates Change-Id: I203e72a203ffa7538aadc7b96e1ae7e21956c160 --- M library/RSL_Types.ttcn 1 file changed, 54 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 95a7b1f..7992132 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -577,6 +577,28 @@ RSL_ChanNeeded chan_needed } + /* 9.3.41 CB Command Type */ + type enumerated RSL_CbCommand { + RSL_CB_CMD_NORMAL ('0000'B), + RSL_CB_CMD_SCHEDULE ('1000'B), + RSL_CB_CMD_DEFAULT ('1110'B), + RSL_CB_CMD_NULL ('1111'B) + } with { variant "FIELDLENGTH(4)" }; + type record RSL_IE_CbCommandType { + RSL_CbCommand command, + boolean default_bcast_null, + BIT1 spare, + uint2_t last_block + }; + template (value) RSL_IE_CbCommandType ts_RSL_IE_CbCmdType(RSL_CbCommand cmd := RSL_CB_CMD_NORMAL, + uint2_t last_block := 1, + boolean def_bcast_null := true) := { + command := cmd, + default_bcast_null := def_bcast_null, + spare := '0'B, + last_block := last_block + } + /* 9.3.53 */ type record RSL_IE_MultirateCtrl { uint3_t spare, @@ -678,6 +700,9 @@ uint16_t paging_load, uint8_t paging_group, RSL_IE_ChanNeeded chan_needed, + RSL_IE_CbCommandType cb_cmd_type, + RSL_LV smscb_message, + RSL_IE_StartingTime starting_time, RSL_IE_EncryptionInfo encr_info, RSL_IE_RequestRef req_ref, @@ -726,6 +751,8 @@ paging_load, iei = RSL_IE_PAGING_LOAD; paging_group, iei = RSL_IE_PAGING_GROUP; chan_needed, iei = RSL_IE_CHAN_NEEDED; + cb_cmd_type, iei = RSL_IE_CB_CMD_TYPE; + smscb_message, iei = RSL_IE_SMSCB_MSG; starting_time, iei = RSL_IE_STARTNG_TIME; encr_info, iei = RSL_IE_ENCR_INFO; @@ -1467,6 +1494,33 @@ ies := * } + /* 8.5.8 BTS <- BSC SMS BROADCAST COMMAND */ + template RSL_Message tr_RSL_SMSCB_CMD(template RSL_IE_CbCommandType cb_cmd := ?, + template octetstring msg := ?, + template RslChannelNr chan_nr := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_SMS_BC_CMD, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{cb_cmd_type := cb_cmd}), + tr_RSL_IE(RSL_IE_Body:{smscb_message := tr_RSL_LV(msg)}), + * + } + } + template (value) RSL_Message ts_RSL_SMSCB_CMD(template (value) RSL_IE_CbCommandType cb_cmd, + template (value) octetstring msg, + template (value) RslChannelNr chan_nr := + ts_RslChanNr_SDCCH4(0, 2)) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false), + msg_type := RSL_MT_SMS_BC_CMD, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + t_RSL_IE(RSL_IE_CB_CMD_TYPE, RSL_IE_Body:{cb_cmd_type := cb_cmd}), + t_RSL_IE(RSL_IE_SMSCB_MSG, RSL_IE_Body:{smscb_message := ts_RSL_LV(msg)}) + /* optional channel type for extended CBCH */ + } + } + /* 8.6.2 BTS <- BSC */ template (value) RSL_Message ts_RSL_SACCH_FILL(RSL_IE_SysinfoType si_type, octetstring l3_info) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_TRX_MGMT, false), -- To view, visit https://gerrit.osmocom.org/10980 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: I203e72a203ffa7538aadc7b96e1ae7e21956c160 Gerrit-Change-Number: 10980 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 Sep 16 20:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Add support for Osmocom RSL ChannelNr CBCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10981 ) Change subject: GSM_Types: Add support for Osmocom RSL ChannelNr CBCH ...................................................................... GSM_Types: Add support for Osmocom RSL ChannelNr CBCH Osmocom uses 0xC8 as channel number for CBCH, this is an extension to the 08.58 definitions. Change-Id: I2203f4a9012c154c12ac9d8f9c448a9ed0f49197 --- M library/GSM_Types.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 59ccb76..53208e5 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -60,7 +60,8 @@ RSL_CHAN_NR_BCCH ('10000'B), RSL_CHAN_NR_RACH ('10001'B), RSL_CHAN_NR_PCH_AGCH ('10010'B), - RSL_CHAN_NR_OSMO_PDCH ('11000'B) + RSL_CHAN_NR_OSMO_PDCH ('11000'B), + RSL_CHAN_NR_OSMO_CBCH ('11001'B) } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; type record RslChanNr2 { @@ -107,6 +108,7 @@ template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); + template RslChannelNr t_RslChanNr_CBCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH); template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := { u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, tn := tn @@ -129,6 +131,7 @@ template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); + template (value) RslChannelNr ts_RslChanNr_CBCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH); template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := { u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, tn := tn -- To view, visit https://gerrit.osmocom.org/10981 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: I2203f4a9012c154c12ac9d8f9c448a9ed0f49197 Gerrit-Change-Number: 10981 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 Sep 16 20:02:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Add CBCH_Block definition of TS 04.12 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10982 Change subject: GSM_Types: Add CBCH_Block definition of TS 04.12 ...................................................................... GSM_Types: Add CBCH_Block definition of TS 04.12 Change-Id: Ib034aba11a0219959c4224238e559ba36e95cacf --- M library/GSM_Types.ttcn M library/General_Types.ttcn 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/10982/1 diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 53208e5..88be975 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -207,6 +207,48 @@ } } + +/* TS 04.12 Section 3.3.1 Block type */ +type record CBCH_BlockType { + BIT1 spare, + BIT2 lpd, + boolean last_block, + uint4_t seq_nr +}; +template (value) CBCH_BlockType ts_CBCH_BlockType(template (value) uint4_t seq_nr, template (value) boolean last_block) := { + spare := '0'B, + lpd := '01'B, + last_block := last_block, + seq_nr := seq_nr +}; +template CBCH_BlockType tr_CBCH_BlockType(template uint4_t seq_nr := ?, template boolean last_block := ?) := { + spare := '0'B, + lpd := '01'B, + last_block := last_block, + seq_nr := seq_nr +}; + +/* TS 04.12 Section 3.3 */ +type record CBCH_Block { + CBCH_BlockType block_type, + OCT22 payload +}; +template (value) CBCH_Block ts_CBCH_Block(template (value) uint4_t seq_nr, template (value) boolean last_block, template (value) OCT22 payload) := { + block_type := ts_CBCH_BlockType(seq_nr, last_block), + payload := payload +}; +template CBCH_Block tr_CBCH_Block(template uint4_t seq_nr := ?, template boolean last_block := ?, template OCT22 payload := ?) := { + block_type := tr_CBCH_BlockType(seq_nr, last_block), + payload := payload +}; + + +external function enc_CBCH_Block(in CBCH_Block msg) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_CBCH_Block(in octetstring stream) return CBCH_Block + with { extension "prototype(convert) decode(RAW)" }; + + /* Convert RF signal level in dBm to RxLev (TS 45.008 Chapter 8.1.4) */ function dbm2rxlev(integer dbm) return uint6_t { var integer rxlev := dbm + 110; diff --git a/library/General_Types.ttcn b/library/General_Types.ttcn index 83b2a42..612d5c7 100644 --- a/library/General_Types.ttcn +++ b/library/General_Types.ttcn @@ -233,6 +233,7 @@ type octetstring OCT18 length(18) with { variant "FIELDLENGTH(18)" }; type octetstring OCT19 length(19) with { variant "FIELDLENGTH(19)" }; type octetstring OCT20 length(20) with { variant "FIELDLENGTH(20)" }; + type octetstring OCT22 length(22) with { variant "FIELDLENGTH(22)" }; type octetstring OCT32 length(32) with { variant "FIELDLENGTH(32)" }; type octetstring OCT34 length(34) with { variant "FIELDLENGTH(34)" }; type octetstring OCT46 length(46) with { variant "FIELDLENGTH(46)" }; -- To view, visit https://gerrit.osmocom.org/10982 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: Ib034aba11a0219959c4224238e559ba36e95cacf Gerrit-Change-Number: 10982 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 20:02:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:02:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: CBCH related tests for BTS Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10983 Change subject: WIP: CBCH related tests for BTS ...................................................................... WIP: CBCH related tests for BTS This introduces a set of CBCH related tests for osmo-bts. Warning: Those tests currently require a patched trxcon to work. Change-Id: I955b4000c12180a39b0205b69b7b2c8cee8c9da3 --- M bts/BTS_Tests.ttcn 1 file changed, 260 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/10983/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index aa402d1..4fafe0e 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4079,7 +4079,261 @@ /* receptiom of SABM in multi-frame established state */ +/*********************************************************************** + * Cell Broadcast related tests + ***********************************************************************/ +type record CbchTestPars { + boolean use_sdcch4, + CbchTestMsgs msgs +}; + +type record CbchTestMsg { + /* config / input data */ + RSL_CbCommand rsl_cb_cmd, + uint2_t last_block, /* 0..3 */ + octetstring payload, + /* computed / result data */ + CbchBlocks blocks optional +}; +type record of CbchTestMsg CbchTestMsgs; + +/* a single 22byte block within a CbchTestMsg */ +type record CbchBlock { + uint4_t seq_nr, /* as per TS 04.12 */ + boolean is_last, + OCT22 payload, + boolean seen_once +}; +type record of CbchBlock CbchBlocks; + +/* compute the expected blocks for given test parameters */ +private function f_cbch_compute_exp_blocks(inout CbchTestPars pars) { + var integer i; + + for (i := 0; i < lengthof(pars.msgs); i := i+1) { + pars.msgs[i].blocks := f_comp_blocks(pars.msgs[i]); + } +} +private function f_comp_blocks(in CbchTestMsg msg) return CbchBlocks { + var CbchBlocks blocks := {}; + var integer i; + + for (i := 0; i <= msg.last_block; i := i+1) { + var CbchBlock block := { + seq_nr := i, + is_last := false, + payload := substr(msg.payload, 22*i, 22), + seen_once := false + }; + if (msg.rsl_cb_cmd == RSL_CB_CMD_SCHEDULE and i == 0) { + block.seq_nr := 8; + } + if (i == msg.last_block) { + block.is_last := true; + } + blocks := blocks & {block}; + } + + return blocks; +}; + +/* TS 48.058 Section 9.3.41 */ +private function f_cbch_block_nr2rsl(uint2_t nr) return uint2_t { + select (nr) { + case (0) { return 1; } + case (1) { return 2; } + case (2) { return 3; } + case (3) { return 0; } + } + setverdict(fail, "Invalid block number"); + mtc.stop; +} + +/* Verify the CBCH TB scheduling rules of TS 05.02 Section 6.5.4 */ +private function f_cbch_fn_verify(uint32_t fn, CBCH_Block cb) +{ + var integer tb := (fn/51) mod 8; /* TS 05.02 Section 6.5.4 */ + if (cb.block_type.seq_nr == 15 /* null */) { + /* always permitted */ + return; + } else if (cb.block_type.seq_nr == 8 /* schedule */) { + if (tb != 0) { + setverdict(fail, "Schedule block at TB=", tb); + } + } else if (cb.block_type.seq_nr < 4) { + if (cb.block_type.seq_nr != tb and cb.block_type.seq_nr+4 != tb) { + setverdict(fail, "Normal block at wrong TB=", tb, ": ", cb); + } + } +} + +/* shared function doing the heavy lifting for most CBCH tests */ +private function f_TC_smscb(CbchTestPars pars) runs on test_CT { + var L1ctlDlMessage dl; + var boolean cmd_seen_once := false; + var integer i, j; + timer T := 5.0; + + f_cbch_compute_exp_blocks(pars); + + f_init_vty_bsc(); + /* ensure that a CBCH is present in channel combination */ + if (pars.use_sdcch4) { + f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + "phys_chan_config CCCH+SDCCH4+CBCH"); + f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, + "phys_chan_config SDCCH8"); + } else { + f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + "phys_chan_config CCCH+SDCCH4"); + f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, + "phys_chan_config SDCCH8+CBCH"); + } + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + f_sleep(2.0); + f_init(testcasename()); + + f_init_l1ctl(); + f_l1_tune(L1CTL); + + /* send SMSCB[s] via RSL */ + for (i := 0; i < lengthof(pars.msgs); i := i+1) { + var CbchTestMsg msg := pars.msgs[i]; + var uint2_t rsl_last_block := f_cbch_block_nr2rsl(msg.last_block); + var RSL_IE_CbCommandType cmd_type := + valueof(ts_RSL_IE_CbCmdType(msg.rsl_cb_cmd, rsl_last_block)); + RSL_CCHAN.send(ts_RSL_UD(ts_RSL_SMSCB_CMD(cmd_type, msg.payload))); + } + T.start; + /* Expect this to show up exactly once on the basic CBCH (four blocks) */ + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl { + log("CBCH: ", dl); + var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload); + /* detect the proper CBCH messages; check frame number */ + f_cbch_fn_verify(dl.dl_info.frame_nr, cb); + if (not match(cb, tr_CBCH_Block)) { + setverdict(fail, "Illegal CBCH Block received: ", cb); + } else { + var boolean matched := false; + /* ignore NULL messages */ + if (match(cb, tr_CBCH_Block(15, ?, ?))) { repeat; } + for (i := 0; i < lengthof(pars.msgs); i := i+1) { + for (j := 0; j < lengthof(pars.msgs[i].blocks); j := j+1) { + var CbchBlock b := pars.msgs[i].blocks[j]; + if (match(cb, tr_CBCH_Block(b.seq_nr, b.is_last, b.payload))) { + if (not pars.msgs[i].blocks[j].seen_once) { + pars.msgs[i].blocks[j].seen_once := true; + setverdict(pass); + } else { + setverdict(fail, "Received SMSCB twice! ", cb); + } + matched := true; + continue; + } + } + } + if (not matched) { + setverdict(fail, "Received unexpected CBCH block: ", cb); + } + repeat; + } + } + [] L1CTL.receive { repeat; } + [] T.timeout { + for (i := 0; i < lengthof(pars.msgs); i := i+1) { + for (j := 0; j < lengthof(pars.msgs[i].blocks); j := j+1) { + var CbchBlock b := pars.msgs[i].blocks[j]; + if (not b.seen_once) { + setverdict(fail, "Timeout waiting for CBCH"); + } + } + } + } + } + + /* reset timeslot 0 channel combination to default */ + f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + "phys_chan_config CCCH+SDCCH4"); + f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, + "phys_chan_config SDCCH8"); + f_shutdown(); +} + +/* transmit single-block SMSCB COMMAND */ +testcase TC_sms_cb_cmd_cbch_sdcch4_1block() runs on test_CT { + var CbchTestPars pars := { + use_sdcch4 := true, + msgs := { + { RSL_CB_CMD_NORMAL, 0, '001000320f1141660c344dd3cba09a0c000000000000'O, + omit } + } + }; + f_TC_smscb(pars); +} + +/* transmit dual-block SMSCB COMMAND */ +testcase TC_sms_cb_cmd_cbch_sdcch4_2block() runs on test_CT { + var CbchTestPars pars := { + use_sdcch4 := true, + msgs := { + { RSL_CB_CMD_NORMAL, 1, '001000320f1141660c344dd3cba09a0c000000000000'O & + '000102030405060708090a0b0c0d0e0f101213141516'O, + omit } + } + }; + f_TC_smscb(pars); +} + +/* transmit triple-block SMSCB COMMAND */ +testcase TC_sms_cb_cmd_cbch_sdcch4_3block() runs on test_CT { + var CbchTestPars pars := { + use_sdcch4 := true, + msgs := { + { RSL_CB_CMD_NORMAL, 2, '001000320f1141660c344dd3cba09a0c000000000000'O & + '000102030405060708090a0b0c0d0e0f101213141516'O & + '101112131415161718191a1b1c1d1e1f202223242526'O, + omit } + } + }; + f_TC_smscb(pars); + +} + +/* transmit quad-block SMSCB COMMAND */ +testcase TC_sms_cb_cmd_cbch_sdcch4_4block() runs on test_CT { + var CbchTestPars pars := { + use_sdcch4 := true, + msgs := { + { RSL_CB_CMD_NORMAL, 3, '001000320f1141660c344dd3cba09a0c000000000000'O & + '000102030405060708090a0b0c0d0e0f101213141516'O & + '101112131415161718191a1b1c1d1e1f202223242526'O & + '202122232425262728292a2b2c2d2e2f303233343536'O, + omit } + } + }; + f_TC_smscb(pars); +} + +/* transmit SMSCB COMMAND with SCHEDULE payload */ +testcase TC_sms_cb_cmd_cbch_sdcch4_schedule() runs on test_CT { + var CbchTestPars pars := { + use_sdcch4 := true, + msgs := { + { RSL_CB_CMD_SCHEDULE, 3, '001000320f1141660c344dd3cba09a0c000000000000'O & + '000102030405060708090a0b0c0d0e0f101213141516'O & + '101112131415161718191a1b1c1d1e1f202223242526'O & + '202122232425262728292a2b2c2d2e2f303233343536'O, + omit } + } + }; + f_TC_smscb(pars); +} + +/* transmit SMSCB COMMAND with DEFAULT message */ +testcase TC_sms_cb_cmd_cbch_sdcch4_default() runs on test_CT { +} /* TODO Areas: @@ -4204,6 +4458,12 @@ execute( TC_tch_sign_l2_fill_frame() ); execute( TC_tch_sign_l2_fill_frame_dtxd() ); + + execute( TC_sms_cb_cmd_cbch_sdcch4_1block() ); + execute( TC_sms_cb_cmd_cbch_sdcch4_2block() ); + execute( TC_sms_cb_cmd_cbch_sdcch4_3block() ); + execute( TC_sms_cb_cmd_cbch_sdcch4_4block() ); + execute( TC_sms_cb_cmd_cbch_sdcch4_schedule() ); } -- To view, visit https://gerrit.osmocom.org/10983 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: I955b4000c12180a39b0205b69b7b2c8cee8c9da3 Gerrit-Change-Number: 10983 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 20:03:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 16 Sep 2018 20:03:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Add CBCH_Block definition of TS 04.12 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10982 ) Change subject: GSM_Types: Add CBCH_Block definition of TS 04.12 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10982 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: Ib034aba11a0219959c4224238e559ba36e95cacf Gerrit-Change-Number: 10982 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 16 Sep 2018 20:03:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Sep 16 20:43:01 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Sep 2018 20:43:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9ec05b27ea4_4c4de8c68c7655ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 525s] No package 'libpcsclite' found [ 525s] simtrace2-remsim.o: In function `main': [ 525s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 525s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 525s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 525s] apdu_dispatch.o: In function `apdu_segment_in': [ 525s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 525s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 525s] collect2: error: ld returned 1 exit status [ 525s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 525s] make[2]: *** [simtrace2-remsim] Error 1 [ 525s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 525s] Makefile:20: recipe for target 'utils' failed [ 525s] make[1]: *** [utils] Error 2 [ 525s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 525s] dh_auto_build: make -j1 returned exit code 2 [ 525s] debian/rules:4: recipe for target 'build' failed [ 525s] make: *** [build] Error 2 [ 525s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 525s] [ 525s] armbuild26 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 20:42:46 UTC 2018. [ 525s] [ 525s] ### VM INTERACTION START ### [ 528s] [ 439.713207] SysRq : Power Off [ 528s] [ 439.770917] reboot: Power down [ 529s] ### VM INTERACTION END ### [ 529s] [ 529s] armbuild26 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sun Sep 16 20:42:50 UTC 2018. [ 529s] -- 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 Sep 16 21:00:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:00:29 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10961 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... Patch Set 1: I'm not sure how it passed the jenkins job, but this commit breaks libosmocore master. Reverting. -- To view, visit https://gerrit.osmocom.org/10961 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: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Gerrit-Change-Number: 10961 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 16 Sep 2018 21:00:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 21:02:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:02:26 +0000 Subject: Change in libosmocore[master]: Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" Message-ID: Hello dexter, Harald Welte, Jenkins Builder, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/10984 to review the following change. Change subject: Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" ...................................................................... Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" This reverts commit 2fd4fe6aa109c8df50baac465f0393a303a64dd2. As shown in https://jenkins.osmocom.org/jenkins/view/master/job/master-libosmocore/475/a2=default,a3=default,arch=amd64,label=osmocom-master-debian9/console This commit breaks gsm0808_test with: stderr: --- expout 2018-09-16 22:37:31.382280438 +0200 +++ /n/s/dev/make/libosmocore/tests/testsuite.dir/at-groups/21/stdout 2018-09-16 22:37:31.426281372 +0200 @@ -78,9 +78,9 @@ Input: m4_75= 0 smod= 0 m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 + m5_90= 0 icmi= 1 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 6 m7_95= 0 m10_2= 0 m12_2= 0 @@ -92,9 +92,9 @@ Input: m4_75= 1 smod= 0 m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 + m5_90= 0 icmi= 1 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 6 m7_95= 0 m10_2= 0 m12_2= 0 @@ -106,9 +106,9 @@ Input: m4_75= 0 smod= 0 m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 + m5_90= 0 icmi= 1 [...] Change-Id: I9e0d405e303ed86d23703ca6362e958dddb2f861 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 0 insertions(+), 480 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/10984/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 0a7429e..242bce9 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,7 +104,6 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 8431ace..9433817 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -503,20 +503,6 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; -/*! Default speech codec configurations broken down by reate. - * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for - * the Adaptive Multi-Rate Codec Types. */ -enum gsm0808_speech_codec_rate_defaults { - GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, - GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, - GSM0808_SC_CFG_DEFAULT_AMR_5_90 = 0xff06, - GSM0808_SC_CFG_DEFAULT_AMR_6_70 = 0x3e08, - GSM0808_SC_CFG_DEFAULT_AMR_7_40 = 0x0c12, - GSM0808_SC_CFG_DEFAULT_AMR_7_95 = 0xc020, - GSM0808_SC_CFG_DEFAULT_AMR_10_2 = 0x3040, - GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 -}; - /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 4b2a5f5..73f0234 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1161,49 +1161,6 @@ return 0; } -/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a - * given GSM 04.08 AMR configuration struct. - * \param[in] cfg AMR configuration in GSM 04.08 format. - * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. - * \returns configuration bits (S0-S15) */ -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, - bool fr) -{ - uint16_t s15_s0 = 0; - - /* Check each rate bit in the AMR multirate configuration and pick the - * matching default configuration as specified in 3GPP TS 28.062, - * Table 7.11.3.1.3-2. */ - if (cfg->m4_75) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_4_75; - if (cfg->m5_15) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_15; - if (cfg->m5_90) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_90; - if (cfg->m6_70) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_6_70; - if (cfg->m7_40) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_40; - if (cfg->m7_95) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_95; - if (cfg->m10_2) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_10_2; - if (cfg->m12_2) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_12_2; - - /* Note: 3GPP TS 48.008, chapter 3GPP TS 48.008 states that for AMR - * some of the configuration bits must be coded as zeros. The applied - * bitmask matches the default codec settings. See also the definition - * of enum gsm0808_speech_codec_defaults in gsm_08_08.h and - * 3GPP TS 28.062, Table 7.11.3.1.3-2. */ - if (fr) - s15_s0 &= GSM0808_SC_CFG_DEFAULT_FR_AMR; - else - s15_s0 &= GSM0808_SC_CFG_DEFAULT_HR_AMR; - - return s15_s0; -} - /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3d08232..0c40c88 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -205,7 +205,6 @@ gsm0808_cell_id_u_name; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; -gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 29cecb2..ae138be 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1444,200 +1444,6 @@ msgb_free(msg); } -static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) -{ - uint16_t s15_s0; - - printf("Input:\n"); - printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); - printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); - printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); - printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); - printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); - printf(" m7_95= %u\n", cfg->m7_95); - printf(" m10_2= %u\n", cfg->m10_2); - printf(" m12_2= %u\n", cfg->m12_2); - - s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); - printf("Result (fr):\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); - - s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); - printf("Result (hr):\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); - - printf("\n"); -} - -static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg(void) -{ - struct gsm48_multi_rate_conf cfg; - - printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 1; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 1; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 1; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 1; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 1; - cfg.m5_90 = 1; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 1; - cfg.m10_2 = 1; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 1; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 1; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 1; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 1; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 1; - cfg.m5_90 = 0; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 1; - cfg.m10_2 = 0; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 0; - cfg.m5_90 = 1; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 0; - cfg.m10_2 = 1; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 1; - cfg.m5_90 = 1; - cfg.m6_70 = 1; - cfg.m7_40 = 1; - cfg.m7_95 = 1; - cfg.m10_2 = 1; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); -} - int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1689,8 +1495,6 @@ test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); - test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); - printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index dc1deba..6cd7982 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -74,229 +74,4 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) -Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 0000 = 0b0000000000000000 -Result (hr): - S15-S0 = 0000 = 0b0000000000000000 - -Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 5703 = 0b0101011100000011 -Result (hr): - S15-S0 = 0703 = 0b0000011100000011 - -Input: - m4_75= 0 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 0000 = 0b0000000000000000 -Result (hr): - S15-S0 = 0000 = 0b0000000000000000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 5706 = 0b0101011100000110 -Result (hr): - S15-S0 = 0706 = 0b0000011100000110 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 1608 = 0b0001011000001000 -Result (hr): - S15-S0 = 0608 = 0b0000011000001000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 0412 = 0b0000010000010010 -Result (hr): - S15-S0 = 0412 = 0b0000010000010010 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 4020 = 0b0100000000100000 -Result (hr): - S15-S0 = 0020 = 0b0000000000100000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 0 -Result (fr): - S15-S0 = 1040 = 0b0001000001000000 -Result (hr): - S15-S0 = 0000 = 0b0000000000000000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 1 -Result (fr): - S15-S0 = 4082 = 0b0100000010000010 -Result (hr): - S15-S0 = 0002 = 0b0000000000000010 - -Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 570f = 0b0101011100001111 -Result (hr): - S15-S0 = 070f = 0b0000011100001111 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 1 - m12_2= 1 -Result (fr): - S15-S0 = 54f2 = 0b0101010011110010 -Result (hr): - S15-S0 = 0432 = 0b0000010000110010 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 1 -Result (fr): - S15-S0 = 57ce = 0b0101011111001110 -Result (hr): - S15-S0 = 070e = 0b0000011100001110 - -Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 5733 = 0b0101011100110011 -Result (hr): - S15-S0 = 0733 = 0b0000011100110011 - -Input: - m4_75= 0 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 1 -Result (fr): - S15-S0 = 56aa = 0b0101011010101010 -Result (hr): - S15-S0 = 062a = 0b0000011000101010 - -Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 0 -Result (fr): - S15-S0 = 5757 = 0b0101011101010111 -Result (hr): - S15-S0 = 0717 = 0b0000011100010111 - -Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 1 - m12_2= 1 -Result (fr): - S15-S0 = 57ff = 0b0101011111111111 -Result (hr): - S15-S0 = 073f = 0b0000011100111111 - Done -- To view, visit https://gerrit.osmocom.org/10984 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: I9e0d405e303ed86d23703ca6362e958dddb2f861 Gerrit-Change-Number: 10984 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr 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 Sun Sep 16 21:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:02:27 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Neels Hofmeyr has created a revert of this change. ( https://gerrit.osmocom.org/10961 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... -- To view, visit https://gerrit.osmocom.org/10961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: revert Gerrit-Change-Id: I4e656731b16621736c7a2f4e64d9ce63b1064e98 Gerrit-Change-Number: 10961 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 21:06:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:06:53 +0000 Subject: Change in libosmocore[master]: Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10984 ) Change subject: Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10984 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: I9e0d405e303ed86d23703ca6362e958dddb2f861 Gerrit-Change-Number: 10984 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Sun, 16 Sep 2018 21:06:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 16 21:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:06:55 +0000 Subject: Change in libosmocore[master]: Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10984 ) Change subject: Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" ...................................................................... Revert "gsm0808: add function to convert amr gsm0408 setings to gsm0808" This reverts commit 2fd4fe6aa109c8df50baac465f0393a303a64dd2. As shown in https://jenkins.osmocom.org/jenkins/view/master/job/master-libosmocore/475/a2=default,a3=default,arch=amd64,label=osmocom-master-debian9/console This commit breaks gsm0808_test with: stderr: --- expout 2018-09-16 22:37:31.382280438 +0200 +++ /n/s/dev/make/libosmocore/tests/testsuite.dir/at-groups/21/stdout 2018-09-16 22:37:31.426281372 +0200 @@ -78,9 +78,9 @@ Input: m4_75= 0 smod= 0 m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 + m5_90= 0 icmi= 1 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 6 m7_95= 0 m10_2= 0 m12_2= 0 @@ -92,9 +92,9 @@ Input: m4_75= 1 smod= 0 m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 + m5_90= 0 icmi= 1 m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 + m7_40= 0 ver= 6 m7_95= 0 m10_2= 0 m12_2= 0 @@ -106,9 +106,9 @@ Input: m4_75= 0 smod= 0 m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 + m5_90= 0 icmi= 1 [...] Change-Id: I9e0d405e303ed86d23703ca6362e958dddb2f861 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 0 insertions(+), 480 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 0a7429e..242bce9 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,7 +104,6 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 8431ace..9433817 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -503,20 +503,6 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; -/*! Default speech codec configurations broken down by reate. - * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for - * the Adaptive Multi-Rate Codec Types. */ -enum gsm0808_speech_codec_rate_defaults { - GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, - GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, - GSM0808_SC_CFG_DEFAULT_AMR_5_90 = 0xff06, - GSM0808_SC_CFG_DEFAULT_AMR_6_70 = 0x3e08, - GSM0808_SC_CFG_DEFAULT_AMR_7_40 = 0x0c12, - GSM0808_SC_CFG_DEFAULT_AMR_7_95 = 0xc020, - GSM0808_SC_CFG_DEFAULT_AMR_10_2 = 0x3040, - GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 -}; - /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 4b2a5f5..73f0234 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1161,49 +1161,6 @@ return 0; } -/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a - * given GSM 04.08 AMR configuration struct. - * \param[in] cfg AMR configuration in GSM 04.08 format. - * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. - * \returns configuration bits (S0-S15) */ -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, - bool fr) -{ - uint16_t s15_s0 = 0; - - /* Check each rate bit in the AMR multirate configuration and pick the - * matching default configuration as specified in 3GPP TS 28.062, - * Table 7.11.3.1.3-2. */ - if (cfg->m4_75) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_4_75; - if (cfg->m5_15) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_15; - if (cfg->m5_90) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_90; - if (cfg->m6_70) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_6_70; - if (cfg->m7_40) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_40; - if (cfg->m7_95) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_95; - if (cfg->m10_2) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_10_2; - if (cfg->m12_2) - s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_12_2; - - /* Note: 3GPP TS 48.008, chapter 3GPP TS 48.008 states that for AMR - * some of the configuration bits must be coded as zeros. The applied - * bitmask matches the default codec settings. See also the definition - * of enum gsm0808_speech_codec_defaults in gsm_08_08.h and - * 3GPP TS 28.062, Table 7.11.3.1.3-2. */ - if (fr) - s15_s0 &= GSM0808_SC_CFG_DEFAULT_FR_AMR; - else - s15_s0 &= GSM0808_SC_CFG_DEFAULT_HR_AMR; - - return s15_s0; -} - /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3d08232..0c40c88 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -205,7 +205,6 @@ gsm0808_cell_id_u_name; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; -gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 29cecb2..ae138be 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1444,200 +1444,6 @@ msgb_free(msg); } -static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) -{ - uint16_t s15_s0; - - printf("Input:\n"); - printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); - printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); - printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); - printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); - printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); - printf(" m7_95= %u\n", cfg->m7_95); - printf(" m10_2= %u\n", cfg->m10_2); - printf(" m12_2= %u\n", cfg->m12_2); - - s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); - printf("Result (fr):\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); - - s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); - printf("Result (hr):\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); - - printf("\n"); -} - -static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg(void) -{ - struct gsm48_multi_rate_conf cfg; - - printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 1; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 1; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 1; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 1; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 1; - cfg.m5_90 = 1; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 1; - cfg.m10_2 = 1; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 0; - cfg.m5_90 = 1; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 0; - cfg.m10_2 = 1; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 1; - cfg.m5_90 = 0; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 1; - cfg.m10_2 = 0; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 0; - cfg.m5_15 = 1; - cfg.m5_90 = 0; - cfg.m6_70 = 1; - cfg.m7_40 = 0; - cfg.m7_95 = 1; - cfg.m10_2 = 0; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 0; - cfg.m5_90 = 1; - cfg.m6_70 = 0; - cfg.m7_40 = 1; - cfg.m7_95 = 0; - cfg.m10_2 = 1; - cfg.m12_2 = 0; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - - cfg.m4_75 = 1; - cfg.m5_15 = 1; - cfg.m5_90 = 1; - cfg.m6_70 = 1; - cfg.m7_40 = 1; - cfg.m7_95 = 1; - cfg.m10_2 = 1; - cfg.m12_2 = 1; - test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); -} - int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1689,8 +1495,6 @@ test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); - test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); - printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index dc1deba..6cd7982 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -74,229 +74,4 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) -Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 0000 = 0b0000000000000000 -Result (hr): - S15-S0 = 0000 = 0b0000000000000000 - -Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 5703 = 0b0101011100000011 -Result (hr): - S15-S0 = 0703 = 0b0000011100000011 - -Input: - m4_75= 0 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 0000 = 0b0000000000000000 -Result (hr): - S15-S0 = 0000 = 0b0000000000000000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 5706 = 0b0101011100000110 -Result (hr): - S15-S0 = 0706 = 0b0000011100000110 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 1608 = 0b0001011000001000 -Result (hr): - S15-S0 = 0608 = 0b0000011000001000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 0412 = 0b0000010000010010 -Result (hr): - S15-S0 = 0412 = 0b0000010000010010 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 4020 = 0b0100000000100000 -Result (hr): - S15-S0 = 0020 = 0b0000000000100000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 0 -Result (fr): - S15-S0 = 1040 = 0b0001000001000000 -Result (hr): - S15-S0 = 0000 = 0b0000000000000000 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 1 -Result (fr): - S15-S0 = 4082 = 0b0100000010000010 -Result (hr): - S15-S0 = 0002 = 0b0000000000000010 - -Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 570f = 0b0101011100001111 -Result (hr): - S15-S0 = 070f = 0b0000011100001111 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 1 - m12_2= 1 -Result (fr): - S15-S0 = 54f2 = 0b0101010011110010 -Result (hr): - S15-S0 = 0432 = 0b0000010000110010 - -Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 1 -Result (fr): - S15-S0 = 57ce = 0b0101011111001110 -Result (hr): - S15-S0 = 070e = 0b0000011100001110 - -Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 0 -Result (fr): - S15-S0 = 5733 = 0b0101011100110011 -Result (hr): - S15-S0 = 0733 = 0b0000011100110011 - -Input: - m4_75= 0 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 1 -Result (fr): - S15-S0 = 56aa = 0b0101011010101010 -Result (hr): - S15-S0 = 062a = 0b0000011000101010 - -Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 0 -Result (fr): - S15-S0 = 5757 = 0b0101011101010111 -Result (hr): - S15-S0 = 0717 = 0b0000011100010111 - -Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 1 - m12_2= 1 -Result (fr): - S15-S0 = 57ff = 0b0101011111111111 -Result (hr): - S15-S0 = 073f = 0b0000011100111111 - Done -- To view, visit https://gerrit.osmocom.org/10984 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: I9e0d405e303ed86d23703ca6362e958dddb2f861 Gerrit-Change-Number: 10984 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 16 21:12:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 16 Sep 2018 21:12:55 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-libosmocore_=C2=BB_?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,amd64,osmocom-master-debian9_#477?= In-Reply-To: <1168992891.128.1537055746184.JavaMail.jenkins@jenkins.osmocom.org> References: <1168992891.128.1537055746184.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <31304027.138.1537132375009.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Sep 16 21:14:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:14:40 +0000 Subject: Change in libosmocore[master]: logging vty: add 'logging level set-all ' In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10889 ) Change subject: logging vty: add 'logging level set-all ' ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10889 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: I4c3e4f786476cb813fdc0a7c64f30ee04758309d Gerrit-Change-Number: 10889 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 16 Sep 2018 21:14: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 Sep 16 21:14:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 16 Sep 2018 21:14:42 +0000 Subject: Change in libosmocore[master]: logging vty: add 'logging level set-all ' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10889 ) Change subject: logging vty: add 'logging level set-all ' ...................................................................... logging vty: add 'logging level set-all ' Add new command to once-off set each and every category to the given log level, as discussed at length on the openbsc@ mailing list. Show that it works in logging_vty_test.vty. Change-Id: I4c3e4f786476cb813fdc0a7c64f30ee04758309d --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 185 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 3b1d8c6..b2637a5 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -354,6 +354,28 @@ return CMD_SUCCESS; } +DEFUN(logging_level_set_all, logging_level_set_all_cmd, + "logging level set-all " LOG_LEVEL_ARGS, + LOGGING_STR LEVEL_STR + "Once-off set all categories to the given log level. There is no single command" + " to take back these changes -- each category is set to the given level, period.\n" + LOG_LEVEL_STRS) +{ + struct log_target *tgt = osmo_log_vty2tgt(vty); + int level = log_parse_level(argv[0]); + int i; + for (i = 0; i < osmo_log_info->num_cat; i++) { + struct log_category *cat = &tgt->categories[i]; + /* skip empty entries in the array */ + if (!osmo_log_info->cat[i].name) + continue; + + cat->enabled = 1; + cat->loglevel = level; + } + return CMD_SUCCESS; +} + /* logging level () everything */ DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd, NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */ @@ -983,6 +1005,7 @@ "everything", EVERYTHING_STR); install_element_ve(&logging_level_cmd); + install_element_ve(&logging_level_set_all_cmd); install_element_ve(&logging_level_force_all_cmd); install_element_ve(&no_logging_level_force_all_cmd); install_element_ve(&deprecated_logging_level_everything_cmd); @@ -1001,6 +1024,7 @@ install_element(CFG_LOG_NODE, &logging_prnt_level_cmd); install_element(CFG_LOG_NODE, &logging_prnt_file_cmd); install_element(CFG_LOG_NODE, &logging_level_cmd); + install_element(CFG_LOG_NODE, &logging_level_set_all_cmd); install_element(CFG_LOG_NODE, &logging_level_force_all_cmd); install_element(CFG_LOG_NODE, &no_logging_level_force_all_cmd); install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index 03b0c4a..0c552a5 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -51,6 +51,7 @@ logging print file (0|1|basename) [last] logging set-log-mask MASK logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) + logging level set-all (debug|info|notice|error|fatal) logging level force-all (debug|info|notice|error|fatal) no logging level force-all ... !^ logging @@ -74,6 +75,7 @@ eee Exhaustive Entropy Extraction (EEE) lglobal Library-internal global log family ... ! all + set-all Once-off set all categories to the given log level. There is no single command to take back these changes -- each category is set to the given level, period. force-all Globally force all logging categories to a specific level. This is released by the 'no logging level force-all' command. Note: any 'logging level ' commands will have no visible effect after this, until the forced level is released. logging_vty_test# logging level aa ? @@ -96,6 +98,13 @@ logging_vty_test# no logging level ? force-all Release any globally forced log level set with 'logging level force-all ' +logging_vty_test# logging level set-all ? + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + logging_vty_test# log-sweep DAA DEBUG Log message for DAA on level LOGL_DEBUG @@ -304,3 +313,155 @@ DDDDD ERROR Log message for DDDDD on level LOGL_ERROR DDDDD FATAL Log message for DDDDD on level LOGL_FATAL DEEE FATAL Log message for DEEE on level LOGL_FATAL + + +logging_vty_test# ! test 'set-all' +logging_vty_test# logging level set-all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all error +logging_vty_test# log-sweep +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all notice +logging_vty_test# log-sweep +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all info +logging_vty_test# log-sweep +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB DEBUG Log message for DBB on level LOGL_DEBUG +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC DEBUG Log message for DCCC on level LOGL_DEBUG +DCCC INFO Log message for DCCC on level LOGL_INFO +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG +DDDDD INFO Log message for DDDDD on level LOGL_INFO +DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE DEBUG Log message for DEEE on level LOGL_DEBUG +DEEE INFO Log message for DEEE on level LOGL_INFO +DEEE NOTICE Log message for DEEE on level LOGL_NOTICE +DEEE ERROR Log message for DEEE on level LOGL_ERROR +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level set-all fatal +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level dddd error +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level ccc notice +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level bb info +logging_vty_test# log-sweep +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# logging level aa debug +logging_vty_test# log-sweep +DAA DEBUG Log message for DAA on level LOGL_DEBUG +DAA INFO Log message for DAA on level LOGL_INFO +DAA NOTICE Log message for DAA on level LOGL_NOTICE +DAA ERROR Log message for DAA on level LOGL_ERROR +DAA FATAL Log message for DAA on level LOGL_FATAL +DBB INFO Log message for DBB on level LOGL_INFO +DBB NOTICE Log message for DBB on level LOGL_NOTICE +DBB ERROR Log message for DBB on level LOGL_ERROR +DBB FATAL Log message for DBB on level LOGL_FATAL +DCCC NOTICE Log message for DCCC on level LOGL_NOTICE +DCCC ERROR Log message for DCCC on level LOGL_ERROR +DCCC FATAL Log message for DCCC on level LOGL_FATAL +DDDDD ERROR Log message for DDDDD on level LOGL_ERROR +DDDDD FATAL Log message for DDDDD on level LOGL_FATAL +DEEE FATAL Log message for DEEE on level LOGL_FATAL -- To view, visit https://gerrit.osmocom.org/10889 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: I4c3e4f786476cb813fdc0a7c64f30ee04758309d Gerrit-Change-Number: 10889 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 00:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 00:09:43 +0000 Subject: Change in osmo-msc[master]: store classmark in vlr_subscr, not conn Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10985 Change subject: store classmark in vlr_subscr, not conn ...................................................................... store classmark in vlr_subscr, not conn Store all Classmark information in the VLR. So, we now always know the Classmark 1 (mandatory IE for LU). This is visible in the msc_vlr_tests -- they no longer indicate "assuming A5/1 is supported" because classmark 1 is missing, because we now know the Classmark 1. Rationale: During Location Updating, we receive Classmark 1; during CM Service Request and Paging Response, we receive Classmark 2. So far we stored these only for the duration of the conn, so as soon as a LU is complete, we would forget CM1. In other words, for anything else than a LU Request, we had no Classmark 1 available at all. During Ciphering Mode Command, we rely on Classmark 1 to determine whether A5/1 is supported. That is moot if we don't even have a Classmark 1 for any CM Service Request or Paging Response initiated connections. The only reason that A5/1 worked is that we assume A5/1 to work if Classmark 1 is missing. To add to the confusion, if a phone indicated that it did *not* support A5/1 in the Classmark 1, according to spec we're supposed to not service it at all. A code comment however says that we instead want to heed the flag -- which so far was only present in a Location Updating initiated connection. Now we can make this decision without assuming things. This got my attention while hacking on sending a BSSMAP Classmark Request from the MSC if it finds missing Classmark information, and was surprised to see it it lacking CM1 to decide about A5/1. Change-Id: I27081bf6e9e017923b2d02607f7ea06beddad82a --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_rest.err 6 files changed, 75 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/85/10985/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 27f7fc5..ffe3afc 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -127,8 +127,6 @@ /* connected via 2G or 3G? */ enum ran_type via_ran; - struct gsm_classmark classmark; - uint16_t lac; struct gsm_encr encr; diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 386a548..d52713c 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -174,6 +174,8 @@ uint8_t lac; enum ran_type attached_via_ran; } cs; + + struct gsm_classmark classmark; }; enum vlr_ciph { diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 19b0572..b942a03 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -98,14 +98,25 @@ return gsm48_conn_sendmsg(msg, conn, NULL); } +static bool classmark1_is_r99(const struct gsm48_classmark1 *cm1) +{ + return cm1->rev_lev >= 2; +} + +static bool classmark2_is_r99(const uint8_t *cm2, uint8_t cm2_len) +{ + uint8_t rev_lev; + if (!cm2_len) + return false; + rev_lev = (cm2[0] >> 5) & 0x3; + return rev_lev >= 2; +} + static bool classmark_is_r99(struct gsm_classmark *cm) { - int rev_lev = 0; if (cm->classmark1_set) - rev_lev = cm->classmark1.rev_lev; - else if (cm->classmark2_len > 0) - rev_lev = (cm->classmark2[0] >> 5) & 0x3; - return rev_lev >= 2; + return classmark1_is_r99(&cm->classmark1); + return classmark2_is_r99(cm->classmark2, cm->classmark2_len); } /* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher */ @@ -345,9 +356,6 @@ msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string); - conn->classmark.classmark1 = lu->classmark1; - conn->classmark.classmark1_set = true; - DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); @@ -402,7 +410,7 @@ &old_lai, &new_lai, is_utran || conn->network->authentication_required, is_utran || conn->network->a5_encryption_mask > 0x01, - classmark_is_r99(&conn->classmark), + classmark1_is_r99(&lu->classmark1), is_utran, net->vlr->cfg.assign_tmsi); if (!lu_fsm) { @@ -421,6 +429,9 @@ return -EIO; } + conn->vsub->classmark.classmark1 = lu->classmark1; + conn->vsub->classmark.classmark1_set = true; + msc_subscr_conn_complete_layer_3(conn); return 0; } @@ -773,8 +784,6 @@ msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_CM_SERVICE_REQ, mi_string); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, mi_p); - memcpy(conn->classmark.classmark2, classmark2, classmark2_len); - conn->classmark.classmark2_len = classmark2_len; is_utran = (conn->via_ran == RAN_UTRAN_IU); vlr_proc_acc_req(conn->fi, @@ -783,9 +792,20 @@ VLR_PR_ARQ_T_CM_SERV_REQ, mi-1, &lai, is_utran || conn->network->authentication_required, is_utran || conn->network->a5_encryption_mask > 0x01, - classmark_is_r99(&conn->classmark), + classmark2_is_r99(classmark2, classmark2_len), is_utran); + /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect + * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ + if (!conn->vsub) { + LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a CM Service Request\n", + mi_string); + return -EIO; + } + + memcpy(conn->vsub->classmark.classmark2, classmark2, classmark2_len); + conn->vsub->classmark.classmark2_len = classmark2_len; + msc_subscr_conn_complete_layer_3(conn); return 0; } @@ -846,11 +866,6 @@ break; } - /* TODO? We used to remember the subscriber's classmark1 here and - * stored it in the old sqlite db, but now we store it in a conn that - * will be discarded anyway: */ - conn->classmark.classmark1 = idi->classmark1; - if (!vsub) { LOGP(DMM, LOGL_ERROR, "IMSI DETACH for unknown subscriber MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); @@ -860,6 +875,9 @@ if (vsub->cs.is_paging) subscr_paging_cancel(vsub, GSM_PAGING_EXPIRED); + /* We already got Classmark 1 during Location Updating ... but well, ok */ + vsub->classmark.classmark1 = idi->classmark1; + vlr_subscr_rx_imsi_detach(vsub); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_DETACHED, vsub); vlr_subscr_put(vsub); @@ -986,7 +1004,7 @@ is_umts ? "UMTS" : "GSM", is_umts ? "res" : "sres", osmo_hexdump_nospc(res, res_len)); - return vlr_subscr_rx_auth_resp(conn->vsub, classmark_is_r99(&conn->classmark), + return vlr_subscr_rx_auth_resp(conn->vsub, classmark_is_r99(&conn->vsub->classmark), conn->via_ran == RAN_UTRAN_IU, res, res_len); } @@ -1128,27 +1146,15 @@ return rc; } -static uint8_t *gsm48_cm2_get_mi(uint8_t *classmark2_lv, unsigned int tot_len) -{ - /* Check the size for the classmark */ - if (tot_len < 1 + *classmark2_lv) - return NULL; - - uint8_t *mi_lv = classmark2_lv + *classmark2_lv + 1; - if (tot_len < 2 + *classmark2_lv + mi_lv[0]) - return NULL; - - return mi_lv; -} - /* Receive a PAGING RESPONSE message from the MS */ static int gsm48_rx_rr_pag_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct gsm_network *net = conn->network; struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_pag_resp *resp; - uint8_t *classmark2_lv = gh->data + 1; - uint8_t *mi_lv; + uint8_t classmark2_len = gh->data[1]; + uint8_t *classmark2 = gh->data+2; + uint8_t *mi_lv = classmark2 + classmark2_len; uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; struct osmo_location_area_id lai; @@ -1158,8 +1164,11 @@ lai.lac = conn->lac; resp = (struct gsm48_pag_resp *) &gh->data[0]; - gsm48_paging_extract_mi(resp, msgb_l3len(msg) - sizeof(*gh), - mi_string, &mi_type); + + if (gsm48_paging_extract_mi(resp, msgb_l3len(msg) - sizeof(*gh), mi_string, &mi_type) <= 0) { + LOGP(DRR, LOGL_ERROR, "PAGING RESPONSE: invalid Mobile Identity\n"); + return -EINVAL; + } if (msc_subscr_conn_is_establishing_auth_ciph(conn)) { LOGP(DMM, LOGL_ERROR, @@ -1174,17 +1183,8 @@ DEBUGP(DRR, "PAGING RESPONSE: MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); - mi_lv = gsm48_cm2_get_mi(classmark2_lv, msgb_l3len(msg) - sizeof(*gh)); - if (!mi_lv) { - LOGP(DRR, LOGL_ERROR, "PAGING RESPONSE: invalid Mobile Identity\n"); - return -1; - } - msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_PAGING_RESP, mi_string); - memcpy(conn->classmark.classmark2, classmark2_lv+1, *classmark2_lv); - conn->classmark.classmark2_len = *classmark2_lv; - is_utran = (conn->via_ran == RAN_UTRAN_IU); vlr_proc_acc_req(conn->fi, SUBSCR_CONN_E_ACCEPTED, SUBSCR_CONN_E_CN_CLOSE, NULL, @@ -1192,9 +1192,20 @@ VLR_PR_ARQ_T_PAGING_RESP, mi_lv, &lai, is_utran || conn->network->authentication_required, is_utran || conn->network->a5_encryption_mask > 0x01, - classmark_is_r99(&conn->classmark), + classmark2_is_r99(classmark2, classmark2_len), is_utran); + /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect + * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ + if (!conn->vsub) { + LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a Paging Response\n", + mi_string); + return -EIO; + } + + memcpy(conn->vsub->classmark.classmark2, classmark2, classmark2_len); + conn->vsub->classmark.classmark2_len = classmark2_len; + msc_subscr_conn_complete_layer_3(conn); return 0; } @@ -1390,10 +1401,10 @@ gh = msgb_l3(msg); pdisc = gsm48_hdr_pdisc(gh); - if (conn->classmark.classmark1_set && conn->classmark.classmark1.rev_lev < 2) { - modulo = gsm0407_determine_nsd_ret_modulo_r98(pdisc, gh->msg_type, &n_sd); - } else { /* R99 */ + if (conn->vsub && classmark_is_r99(&conn->vsub->classmark)) { modulo = gsm0407_determine_nsd_ret_modulo_r99(pdisc, gh->msg_type, &n_sd); + } else { /* pre R99 */ + modulo = gsm0407_determine_nsd_ret_modulo_r98(pdisc, gh->msg_type, &n_sd); } if (modulo == 0) return false; @@ -1618,7 +1629,7 @@ for (i = 0; i < 8; i++) { if (net->a5_encryption_mask & (1 << i) && - classmark_supports_a5(&conn->classmark, i)) + classmark_supports_a5(&conn->vsub->classmark, i)) ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); } ei.perm_algo_len = j; diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index a6618c0..1966043 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -147,23 +147,25 @@ const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) { + struct gsm_classmark *cm = &conn->vsub->classmark; + if (cm2 && cm2_len) { - if (cm2_len > sizeof(conn->classmark.classmark2)) { + if (cm2_len > sizeof(cm->classmark2)) { LOGP(DRR, LOGL_NOTICE, "%s: classmark2 is %u bytes, truncating at %zu bytes\n", - vlr_subscr_name(conn->vsub), cm2_len, sizeof(conn->classmark.classmark2)); - cm2_len = sizeof(conn->classmark.classmark2); + vlr_subscr_name(conn->vsub), cm2_len, sizeof(cm->classmark2)); + cm2_len = sizeof(cm->classmark2); } - conn->classmark.classmark2_len = cm2_len; - memcpy(conn->classmark.classmark2, cm2, cm2_len); + cm->classmark2_len = cm2_len; + memcpy(cm->classmark2, cm2, cm2_len); } if (cm3 && cm3_len) { - if (cm3_len > sizeof(conn->classmark.classmark3)) { + if (cm3_len > sizeof(cm->classmark3)) { LOGP(DRR, LOGL_NOTICE, "%s: classmark3 is %u bytes, truncating at %zu bytes\n", - vlr_subscr_name(conn->vsub), cm3_len, sizeof(conn->classmark.classmark3)); - cm3_len = sizeof(conn->classmark.classmark3); + vlr_subscr_name(conn->vsub), cm3_len, sizeof(cm->classmark3)); + cm3_len = sizeof(cm->classmark3); } - conn->classmark.classmark3_len = cm3_len; - memcpy(conn->classmark.classmark3, cm3, cm3_len); + cm->classmark3_len = cm3_len; + memcpy(cm->classmark3, cm3, cm3_len); } } diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 83723ab..71e34a8 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -237,7 +237,6 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: 07fa7502e07e1c00 @@ -376,7 +375,6 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: e2b234f807886400 @@ -779,7 +777,6 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: 07fa7502e07e1c00 @@ -918,7 +915,6 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: e2b234f807886400 @@ -2018,7 +2014,6 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 - ...perm algo: 2 - ...key: da149b11d473f400 @@ -2147,7 +2142,6 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 - ...perm algo: 2 - ...key: 26ec67fad3073000 diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index e71295a..395a138 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -71,8 +71,7 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) - BSSAP Clear --RAN_GERAN_A--> MS -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted +DRR 901700000004620: subscriber not allowed to do a CM Service Request DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) bssap_clear_sent == 1 - conn was released -- To view, visit https://gerrit.osmocom.org/10985 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: I27081bf6e9e017923b2d02607f7ea06beddad82a Gerrit-Change-Number: 10985 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 00:09:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 00:09:45 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10986 Change subject: msc_vlr_tests: cosmetically tweak perm algo printing ...................................................................... msc_vlr_tests: cosmetically tweak perm algo printing In the msc_vlr_tests, instead of printing the algo IDs, rather print the corresponding A5/n name, for clarity. Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 --- M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_tests.c 2 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/86/10986/1 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 71e34a8..6a00669 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -68,7 +68,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -238,7 +238,7 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 07fa7502e07e1c00 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -376,7 +376,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: e2b234f807886400 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -571,7 +571,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -778,7 +778,7 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 07fa7502e07e1c00 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -916,7 +916,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: e2b234f807886400 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -1111,7 +1111,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -1352,7 +1352,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=1 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -1582,7 +1582,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -1856,7 +1856,7 @@ DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000010650 - sending Ciphering Mode Command for IMSI:901700000010650: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 7a75f0ac9b844400 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) @@ -2015,7 +2015,7 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: da149b11d473f400 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) @@ -2143,7 +2143,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 26ec67fad3073000 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index f8551dd..bf1b200 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -723,7 +723,7 @@ btw("sending Ciphering Mode Command for %s: include_imeisv=%d", vlr_subscr_name(conn->vsub), include_imeisv); for (i = 0; i < ei->perm_algo_len; i++) - btw("...perm algo: %u", ei->perm_algo[i]); + btw("...perm algo: A5/%u", ei->perm_algo[i] - 1); OSMO_ASSERT(ei->key_len <= sizeof(ei->key)); btw("...key: %s", osmo_hexdump_nospc(ei->key, ei->key_len)); cipher_mode_cmd_sent = true; -- To view, visit https://gerrit.osmocom.org/10986 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: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 Gerrit-Change-Number: 10986 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 00:09:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 00:09:45 +0000 Subject: Change in osmo-msc[master]: A5/n Ciph: request Classmark Update if missing Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10987 Change subject: A5/n Ciph: request Classmark Update if missing ...................................................................... A5/n Ciph: request Classmark Update if missing When the VLR requests a Ciphering Mode with vlr_ops.set_ciph_mode(), and if we need a ciph algo flag from a Classmark information that is not yet known (usually CM 2 during LU), send a BSSMAP Classmark Request to get it. To manage the intermission of the Classmark Request, add - msc_classmark_request_then_cipher_mode_cmd(), - state SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE, - event SUBSCR_CONN_E_CLASSMARK_UPDATE. >From state AUTH_CIPH, switch to state WAIT_CLASSMARK_UPDATE. Once the BSSMAP Classmark Response, is received, switch back to SUBSCR_CONN_S_AUTH_CIPH and re-initiate Ciphering Mode. To be able to re-enter the Ciphering Mode algo decision, factor it out into msc_geran_set_cipher_mode(). Rationale: In the following commit, essentially we stopped supporting A5/3 ciphering: commit 71330720b6efdda2fcfd3e9c0cb45f89e32e5670 "MSC: Intersect configured A5 algorithms with MS-supported ones" Change-Id: Id124923ee52a357cb7d3e04d33f585214774f3a3 A5/3 was no longer supported because from that commit on, we strictly checked the MS-supported ciphers, but we did not have Classmark 2 available during Location Updating. This patch changes that: when Classmark 2 is missing, actively request it by a BSSMAP Classmark Request; continue Ciphering only after the Response. Always request missing Classmark, even if a lesser cipher were configured available. If the Classmark Update response fails to come in, cause an attach failure. Instead, we could attempt to use a lesser cipher that is also enabled. That is left as a future feature, should that become relevant. I think it's unlikely. Technically, we could now end up requesting a Classmark Updating both during LU (vlr_lu_fsm) and CM Service/Paging Response (proc_arq_fsm), but in practice the only time we lack a Classmark is: during Location Updating with A5/3 enabled. A5/1 support is indicated in CM1 which is always available, and A5/3 support is indicated in CM2, which is always available during CM Service Request as well as Paging Response. So this patch has practical relevance only for Location Updating. For networks that permit only A5/3, this patch fixes Location Updating. For networks that support A5/3 and A5/1, so far we always used A5/1 during LU, and after this patch we request CM2 and likely use A5/3 instead. In msc_vlr_test_gsm_ciph, verify that requesting Classmark 2 for A5/3 works during LU. Also verify that the lack of a Classmark Response results in attach failure. In msc_vlr_test_gsm_ciph, a hacky unit test fakes a situation where a CM2 is missing during proc_arq_fsm and proves that that code path works, even though the practical relevance is currently zero. It would only become interesting if ciphering algorithms A5/4 and higher became relevant, because support of those would be indicated in Classmark 3, which would always require a Classmark Request. Related: OS#3043 Depends: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 (libosmocore) Change-Id: I73c7cb6a86624695bd9c0f59abb72e2fdc655131 --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c M src/libmsc/subscr_conn.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 14 files changed, 1,757 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/10987/1 diff --git a/include/osmocom/msc/a_iface.h b/include/osmocom/msc/a_iface.h index 217011d..9a758d3 100644 --- a/include/osmocom/msc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -78,6 +78,8 @@ /* Send clear command via A-interface */ int a_iface_tx_clear_cmd(struct gsm_subscriber_connection *conn); +int a_iface_tx_classmark_request(const struct gsm_subscriber_connection *conn); + /* Clear all subscriber connections on a specified BSC * (Helper function for a_iface_bssap.c) */ void a_clear_all(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *bsc_addr); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index ffe3afc..70ac934 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -130,6 +130,13 @@ uint16_t lac; struct gsm_encr encr; + /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still + * wants to request a Classmark Update first. */ + struct { + bool umts_aka; + bool retrieve_imeisv; + } geran_set_cipher_mode; + /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ uint8_t n_sd_next[4]; diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 7b3702a..3ffb65c 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -16,6 +16,8 @@ SUBSCR_CONN_E_INVALID = 0, /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ SUBSCR_CONN_E_COMPLETE_LAYER_3, + /* Received Classmark Update, typically neede for Ciphering Mode Command */ + SUBSCR_CONN_E_CLASSMARK_UPDATE, /* LU or Process Access FSM has determined that this conn is good */ SUBSCR_CONN_E_ACCEPTED, /* received first reply from MS in "real" CC, SMS, USSD communication */ @@ -33,6 +35,7 @@ enum subscr_conn_fsm_state { SUBSCR_CONN_S_NEW, SUBSCR_CONN_S_AUTH_CIPH, + SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE, SUBSCR_CONN_S_ACCEPTED, SUBSCR_CONN_S_COMMUNICATING, SUBSCR_CONN_S_RELEASING, @@ -62,6 +65,9 @@ struct msgb *msg, uint16_t chosen_channel); void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg); +int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, + bool retrieve_imeisv); +int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); void msc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t alg_id); void msc_rx_sec_mode_compl(struct gsm_subscriber_connection *conn); diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 75fa438..bd9b890 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -422,6 +422,16 @@ return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); } +int a_iface_tx_classmark_request(const struct gsm_subscriber_connection *conn) +{ + struct msgb *msg; + + LOGPCONN(conn, LOGL_INFO, "Tx BSSMAP CLASSMARK REQUEST to BSC\n"); + + msg = gsm0808_create_classmark_request(); + return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); +} + /* Callback function: Close all open connections */ static void a_reset_cb(const void *priv) { diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b942a03..564e90b 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -119,13 +119,16 @@ return classmark2_is_r99(cm->classmark2, cm->classmark2_len); } -/* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher */ -static bool classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) +/* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher. + * Return 1 when the given A5/n is permitted, 0 when not, and negative if the respective MS CLASSMARK is + * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not + * available. */ +static int classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) { switch (a5) { case 0: /* all phones must implement A5/0, see 3GPP TS 43.020 4.9 */ - return true; + return 1; case 1: /* 3GPP TS 43.020 4.9 requires A5/1 to be suppored by all phones and actually states: * "The network shall not provide service to an MS which indicates that it does not @@ -134,25 +137,24 @@ /* See 3GPP TS 24.008 10.5.1.7 */ if (!cm->classmark1_set) { DEBUGP(DMSC, "CLASSMARK 1 unknown, assuming MS supports A5/1\n"); - return true; + return -1; } else { if (cm->classmark1.a5_1) - return false; /* Inverted logic for this bit! */ + return 0; /* Inverted logic for this bit! */ else - return true; + return 1; } break; case 2: case 3: /* See 3GPP TS 24.008 10.5.1.6 */ if (cm->classmark2_len < 3) { - DEBUGP(DMSC, "CLASSMARK 2 unknown, assuming MS doesn't support A5/%u\n", a5); - return false; + return -2; } else { if (cm->classmark2[2] & (1 << (a5-2))) - return true; + return 1; else - return false; + return 0; } break; case 4: @@ -161,13 +163,12 @@ case 7: /* See 3GPP TS 24.008 10.5.1.7 */ if (cm->classmark3_len < 1) { - DEBUGP(DMSC, "CLASSMARK 3 unknown, assuming MS doesn't support A5/%u\n", a5); - return false; + return -3; } else { if (cm->classmark3[0] & (1 << (a5-4))) - return true; + return 1; else - return false; + return 0; } break; default: @@ -1592,6 +1593,78 @@ osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); +int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv) +{ + struct gsm_network *net = conn->network; + struct gsm0808_encrypt_info ei; + int i, j = 0; + int request_classmark = 0; + int request_classmark_for_a5_n = 0; + struct gsm_auth_tuple *tuple = conn->vsub->last_tuple; + + if (!conn || !conn->vsub || !conn->vsub->last_tuple) { + /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode() + * already. */ + LOGP(DMM, LOGL_ERROR, "Internal error: missing state during Ciphering Mode Command\n"); + return -EINVAL; + } + + for (i = 0; i < 8; i++) { + int supported; + + /* A5/n permitted by osmo-msc.cfg? */ + if (!(net->a5_encryption_mask & (1 << i))) + continue; + + /* A5/n supported by MS? */ + supported = classmark_supports_a5(&conn->vsub->classmark, i); + if (supported == 1) { + ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); + /* A higher A5/n is supported, so no need to request a Classmark + * for support of a lesser A5/n. */ + request_classmark = 0; + } else if (supported < 0) { + request_classmark = -supported; + request_classmark_for_a5_n = i; + } + } + ei.perm_algo_len = j; + + if (request_classmark) { + /* The highest A5/n as from osmo-msc.cfg might be available, but we are + * still missing the Classmark information for that from the MS. First + * ask for that. */ + LOGP(DMM, LOGL_DEBUG, "%s: to determine whether A5/%d is supported," + " first ask for a Classmark Update to obtain Classmark %d\n", + vlr_subscr_name(conn->vsub), request_classmark_for_a5_n, + request_classmark); + + return msc_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); + } + + if (ei.perm_algo_len == 0) { + LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection " + "between MSC-configured and MS-supported A5 algorithms\n", + vlr_subscr_name(conn->vsub)); + return -ENOTSUP; + } + + DEBUGP(DMM, "-> CIPHER MODE COMMAND %s\n", vlr_subscr_name(conn->vsub)); + + tuple = conn->vsub->last_tuple; + + /* In case of UMTS AKA, the Kc for ciphering must be derived from the 3G auth + * tokens. tuple->vec.kc was calculated from the GSM algorithm and is not + * necessarily a match for the UMTS AKA tokens. */ + if (umts_aka) + osmo_auth_c3(ei.key, tuple->vec.ck, tuple->vec.ik); + else + memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc)); + ei.key_len = sizeof(tuple->vec.kc); + + return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv); +} + /* VLR asks us to start using ciphering. * (Keep non-static to allow regression testing on this function.) */ int msc_vlr_set_ciph_mode(void *msc_conn_ref, @@ -1620,38 +1693,7 @@ switch (conn->via_ran) { case RAN_GERAN_A: - DEBUGP(DMM, "-> CIPHER MODE COMMAND %s\n", - vlr_subscr_name(conn->vsub)); - { - struct gsm_network *net = conn->network; - struct gsm0808_encrypt_info ei; - int i, j = 0; - - for (i = 0; i < 8; i++) { - if (net->a5_encryption_mask & (1 << i) && - classmark_supports_a5(&conn->vsub->classmark, i)) - ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); - } - ei.perm_algo_len = j; - - if (ei.perm_algo_len == 0) { - LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection " - "between MSC-configured and MS-supported A5 algorithms\n", - vlr_subscr_name(conn->vsub)); - return -ENOTSUP; - } - - /* In case of UMTS AKA, the Kc for ciphering must be derived from the 3G auth - * tokens. tuple->vec.kc was calculated from the GSM algorithm and is not - * necessarily a match for the UMTS AKA tokens. */ - if (umts_aka) - osmo_auth_c3(ei.key, tuple->vec.ck, tuple->vec.ik); - else - memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc)); - ei.key_len = sizeof(tuple->vec.kc); - - return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv); - } + return msc_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); case RAN_UTRAN_IU: #ifdef BUILD_IU diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 1966043..8efa16c 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -167,6 +167,10 @@ cm->classmark3_len = cm3_len; memcpy(cm->classmark3, cm3, cm3_len); } + + /* bump subscr conn FSM in case it is waiting for a Classmark Update */ + if (conn->fi->state == SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE) + osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_CLASSMARK_UPDATE, NULL); } /* Receive a CIPHERING MODE COMPLETE from BSC */ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index 2040e36..e6fa7e1 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -45,6 +45,7 @@ static const struct value_string subscr_conn_fsm_event_names[] = { OSMO_VALUE_STRING(SUBSCR_CONN_E_INVALID), OSMO_VALUE_STRING(SUBSCR_CONN_E_COMPLETE_LAYER_3), + OSMO_VALUE_STRING(SUBSCR_CONN_E_CLASSMARK_UPDATE), OSMO_VALUE_STRING(SUBSCR_CONN_E_ACCEPTED), OSMO_VALUE_STRING(SUBSCR_CONN_E_COMMUNICATING), OSMO_VALUE_STRING(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED), @@ -163,6 +164,66 @@ } } +int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, + bool retrieve_imeisv) +{ + int rc; + conn->geran_set_cipher_mode.umts_aka = umts_aka; + conn->geran_set_cipher_mode.retrieve_imeisv = retrieve_imeisv; + + rc = a_iface_tx_classmark_request(conn); + if (rc) { + LOGP(DMM, LOGL_ERROR, "%s: cannot send BSSMAP Classmark Request\n", + vlr_subscr_name(conn->vsub)); + return -EIO; + } + + osmo_fsm_inst_state_chg(conn->fi, SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE, SUBSCR_CONN_TIMEOUT, 0); + return 0; +} + +static void subscr_conn_fsm_wait_classmark_update(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_subscriber_connection *conn = fi->priv; + switch (event) { + case SUBSCR_CONN_E_CLASSMARK_UPDATE: + /* Theoretically, this event can be used for requesting Classmark in various situations. + * So far though, the only time we send a Classmark Request is during Ciphering. As soon + * as more such situations arise, we need to add state to indicate what action should + * follow after a Classmark Update is received (e.g. + * msc_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that + * Ciphering should continue afterwards). But right now, it is accurate to always + * continue with Ciphering: */ + + /* During Ciphering, we needed Classmark information. The Classmark Update has come in, + * go back into the Set Ciphering Command procedure. */ + osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_AUTH_CIPH, SUBSCR_CONN_TIMEOUT, 0); + if (msc_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka, + conn->geran_set_cipher_mode.retrieve_imeisv)) { + LOGPFSML(fi, LOGL_ERROR, + "Sending Cipher Mode Command failed, aborting attach\n"); + vlr_subscr_cancel_attach_fsm(conn->vsub, OSMO_FSM_TERM_ERROR, + GSM48_REJECT_NETWORK_FAILURE); + } + return; + + case SUBSCR_CONN_E_UNUSED: + LOGPFSML(fi, LOGL_DEBUG, "Awaiting results for Auth+Ciph, overruling event %s\n", + osmo_fsm_event_name(fi->fsm, event)); + return; + + case SUBSCR_CONN_E_MO_CLOSE: + case SUBSCR_CONN_E_CN_CLOSE: + log_close_event(fi, event, data); + evaluate_acceptance_outcome(fi, false); + osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_RELEASING, SUBSCR_CONN_TIMEOUT, 0); + return; + + default: + OSMO_ASSERT(false); + } +} + static bool subscr_conn_fsm_has_active_transactions(struct osmo_fsm_inst *fi) { struct gsm_subscriber_connection *conn = fi->priv; @@ -362,10 +423,21 @@ S(SUBSCR_CONN_E_MO_CLOSE) | S(SUBSCR_CONN_E_CN_CLOSE) | S(SUBSCR_CONN_E_UNUSED), - .out_state_mask = S(SUBSCR_CONN_S_ACCEPTED) | + .out_state_mask = S(SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE) | + S(SUBSCR_CONN_S_ACCEPTED) | S(SUBSCR_CONN_S_RELEASING), .action = subscr_conn_fsm_auth_ciph, }, + [SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE] = { + .name = OSMO_STRINGIFY(SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE), + .in_event_mask = S(SUBSCR_CONN_E_CLASSMARK_UPDATE) | + S(SUBSCR_CONN_E_MO_CLOSE) | + S(SUBSCR_CONN_E_CN_CLOSE) | + S(SUBSCR_CONN_E_UNUSED), + .out_state_mask = S(SUBSCR_CONN_S_AUTH_CIPH) | + S(SUBSCR_CONN_S_RELEASING), + .action = subscr_conn_fsm_wait_classmark_update, + }, [SUBSCR_CONN_S_ACCEPTED] = { .name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED), /* allow everything to release for any odd behavior */ diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index e6b20e6..1d1956a 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -35,6 +35,7 @@ -Wl,--wrap=msc_mgcp_call_assignment \ -Wl,--wrap=a_iface_tx_cipher_mode \ -Wl,--wrap=ranap_iu_tx_sec_mode_cmd \ + -Wl,--wrap=osmo_sccp_tx_data_msg \ $(NULL) LDADD = \ diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index add9f7f..4254066 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -1053,8 +1053,11 @@ comment_end(); } -static void test_a5_3_not_supported() +static void test_a5_3_supported() { + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + comment_start(); /* implicit: net->authentication_required = true; */ @@ -1093,12 +1096,403 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); BTW("MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS" - " -- alas, no matching cipher can be found, abort and release"); + " -- but needs Classmark 2 to determine whether A5/3 is supported"); cipher_mode_cmd_sent = false; - expect_bssap_clear(); ms_sends_msg("05542d8b2c3e"); OSMO_ASSERT(!cipher_mode_cmd_sent); - VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3"); + expect_cipher_mode_cmd("61855fb81fc2a800"); + bss_sends_bssap_mgmt("541203505886130b6014042f6503b8800d2100"); + OSMO_ASSERT(cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000004026f0"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804032443f2", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT"); + expect_bssap_clear(); + gsup_rx("06010809710000004026f0", NULL); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("LU was successful, and the conn has already been closed"); + VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector"); + cm_service_result_sent = RES_NONE; + auth_request_sent = false; + auth_request_expect_rand = "12aca96fb4ffdea5c985cbafa9b6e18b"; + ms_sends_msg("05247803305886089910070000006402"); + OSMO_ASSERT(g_conn); + OSMO_ASSERT(g_conn->fi); + OSMO_ASSERT(g_conn->vsub); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + btw("needs auth, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3," + " so no need to request Classmark Update."); + expect_cipher_mode_cmd("07fa7502e07e1c00"); + ms_sends_msg("0554" "20bde240" /* 2nd vector's sres, s.a. */); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d"); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + /* Release connection */ + expect_bssap_clear(RAN_GERAN_A); + conn_conclude_cm_service_req(g_conn, RAN_GERAN_A); + + btw("all requests serviced, conn has been released"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("an SMS is sent, MS is paged"); + paging_expect_imsi(imsi); + paging_sent = false; + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + + send_sms(vsub, vsub, + "Privacy in residential applications is a desirable" + " marketing option."); + + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + vsub = NULL; + VERBOSE_ASSERT(paging_sent, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == false, "%d"); + + btw("the subscriber and its pending request should remain"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + + btw("MS replies with Paging Response, and VLR sends Auth Request with third key"); + auth_request_sent = false; + auth_request_expect_rand = "e7c03ba7cf0e2fde82b2dc4d63077d42"; + ms_sends_msg("06270703305882089910070000006402"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + btw("needs auth, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Authen Response, VLR accepts and requests Ciphering"); + expect_cipher_mode_cmd("e2b234f807886400"); + ms_sends_msg("0554" "a29514ae" /* 3rd vector's sres, s.a. */); + VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d"); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS"); + dtap_expect_tx("09" /* SMS messages */ + "01" /* CP-DATA */ + "58" /* length */ + "01" /* Network to MS */ + "00" /* reference */ + /* originator (gsm411_send_sms() hardcodes this weird nr) */ + "0791" "447758100650" /* 447785016005 */ + "00" /* dest */ + /* SMS TPDU */ + "4c" /* len */ + "00" /* SMS deliver */ + "05802443f2" /* originating address 42342 */ + "00" /* TP-PID */ + "00" /* GSM default alphabet */ + "071010" /* Y-M-D (from wrapped gsm340_gen_scts())*/ + "000000" /* H-M-S */ + "00" /* GMT+0 */ + "44" /* data length */ + "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e" + "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" + "0c7ac3e9e9b7db05"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == true, "%d"); + + btw("SMS was delivered, no requests pending for subscr"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + vlr_subscr_put(vsub); + + btw("conn is still open to wait for SMS ack dance"); + EXPECT_CONN_COUNT(1); + + btw("MS replies with CP-ACK for received SMS"); + ms_sends_msg("8904"); + EXPECT_CONN_COUNT(1); + + btw("MS also sends RP-ACK, MSC in turn sends CP-ACK for that"); + dtap_expect_tx("0904"); + expect_bssap_clear(); + ms_sends_msg("890106020041020000"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("SMS is done, conn is gone"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("subscriber detaches"); + expect_bssap_clear(); + ms_sends_msg("050130089910070000006402"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + clear_vlr(); + comment_end(); +} + +/* During CM Service Request or Paging Response we already have Classmark 2 that indicates A5/3 + * availablity. Here, in a hacky way remove the knowledge of Classmark 2 to tickle a code path where + * proc_arq_fsm needs a Classmark Update during Ciphering. Shouldn't happen in reality though. */ +static void test_cm_service_needs_classmark_update() +{ + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + + comment_start(); + + /* A5/3 support is indicated in Classmark 3. By configuring A5/3, trigger the code paths that + * send a Classmark Request. */ + net->a5_encryption_mask = (1 << 3); /* A5/3 */ + /* implicit: net->authentication_required = true; */ + + btw("Location Update request causes a GSUP Send Auth Info request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("08010809710000004026f0"); + ms_sends_msg("050802008168000130089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS"); + /* Based on a Ki of 000102030405060708090a0b0c0d0e0f */ + auth_request_sent = false; + auth_request_expect_rand = "585df1ae287f6e273dce07090d61320b"; + auth_request_expect_autn = NULL; + gsup_rx("0a" + /* imsi */ + "0108" "09710000004026f0" + /* 5 auth vectors... */ + /* TL TL rand */ + "0322" "2010" "585df1ae287f6e273dce07090d61320b" + /* TL sres TL kc */ + "2104" "2d8b2c3e" "2208" "61855fb81fc2a800" + "0322" "2010" "12aca96fb4ffdea5c985cbafa9b6e18b" + "2104" "20bde240" "2208" "07fa7502e07e1c00" + "0322" "2010" "e7c03ba7cf0e2fde82b2dc4d63077d42" + "2104" "a29514ae" "2208" "e2b234f807886400" + "0322" "2010" "fa8f20b781b5881329d4fea26b1a3c51" + "2104" "5afc8d72" "2208" "2392f14f709ae000" + "0322" "2010" "0fd4cc8dbe8715d1f439e304edfd68dc" + "2104" "bc8d1c5b" "2208" "da7cdd6bfe2d7000", + NULL); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + BTW("MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS" + " -- but needs Classmark 2 to determine whether A5/3 is supported"); + cipher_mode_cmd_sent = false; + ms_sends_msg("05542d8b2c3e"); + OSMO_ASSERT(!cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3"); + expect_cipher_mode_cmd("61855fb81fc2a800"); + bss_sends_bssap_mgmt("541203505886130b6014042f6503b8800d2100"); + OSMO_ASSERT(cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000004026f0"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804032443f2", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT"); + expect_bssap_clear(); + gsup_rx("06010809710000004026f0", NULL); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("LU was successful, and the conn has already been closed"); + VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + + BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector"); + cm_service_result_sent = RES_NONE; + auth_request_sent = false; + auth_request_expect_rand = "12aca96fb4ffdea5c985cbafa9b6e18b"; + ms_sends_msg("05247803305886089910070000006402"); + OSMO_ASSERT(g_conn); + OSMO_ASSERT(g_conn->fi); + OSMO_ASSERT(g_conn->vsub); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + btw("needs auth, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3," + " so no need to request Classmark Update."); + expect_cipher_mode_cmd("07fa7502e07e1c00"); + ms_sends_msg("0554" "20bde240" /* 2nd vector's sres, s.a. */); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d"); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + /* Release connection */ + expect_bssap_clear(RAN_GERAN_A); + conn_conclude_cm_service_req(g_conn, RAN_GERAN_A); + + btw("all requests serviced, conn has been released"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("an SMS is sent, MS is paged"); + paging_expect_imsi(imsi); + paging_sent = false; + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + + send_sms(vsub, vsub, "Privacy in residential applications is a desirable marketing option."); + + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + vsub = NULL; + VERBOSE_ASSERT(paging_sent, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == false, "%d"); + + btw("the subscriber and its pending request should remain"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + + btw("MS replies with Paging Response, and VLR sends Auth Request with third key"); + auth_request_sent = false; + auth_request_expect_rand = "e7c03ba7cf0e2fde82b2dc4d63077d42"; + ms_sends_msg("06270703305882089910070000006402"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + BTW("Fake a situation where Classmark 2 is unknown during proc_arq_fsm"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + vsub->classmark.classmark2_len = 0; + vsub->classmark.classmark3_len = 0; + vlr_subscr_put(vsub); + + + btw("MS sends Authen Response, VLR accepts and requests Ciphering"); + btw("MS sends Authen Response, VLR accepts and requests Ciphering." + " Normally, we'd know Classmark 3, but this test removed it." + " Hence a Classmark Request is generated."); + cipher_mode_cmd_sent = false; + ms_sends_msg("0554" "a29514ae" /* 3rd vector's sres, s.a. */); + OSMO_ASSERT(!cipher_mode_cmd_sent); + + btw("BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3"); + expect_cipher_mode_cmd("e2b234f807886400"); + bss_sends_bssap_mgmt("541203505886130b6014042f6503b8800d2100"); + OSMO_ASSERT(cipher_mode_cmd_sent); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS"); + dtap_expect_tx("09" /* SMS messages */ + "01" /* CP-DATA */ + "58" /* length */ + "01" /* Network to MS */ + "00" /* reference */ + /* originator (gsm411_send_sms() hardcodes this weird nr) */ + "0791" "447758100650" /* 447785016005 */ + "00" /* dest */ + /* SMS TPDU */ + "4c" /* len */ + "00" /* SMS deliver */ + "05802443f2" /* originating address 42342 */ + "00" /* TP-PID */ + "00" /* GSM default alphabet */ + "071010" /* Y-M-D (from wrapped gsm340_gen_scts())*/ + "000000" /* H-M-S */ + "00" /* GMT+0 */ + "44" /* data length */ + "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e" + "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" + "0c7ac3e9e9b7db05"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == true, "%d"); + + btw("SMS was delivered, no requests pending for subscr"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + vlr_subscr_put(vsub); + + btw("conn is still open to wait for SMS ack dance"); + EXPECT_CONN_COUNT(1); + + btw("MS replies with CP-ACK for received SMS"); + ms_sends_msg("8904"); + EXPECT_CONN_COUNT(1); + + btw("MS also sends RP-ACK, MSC in turn sends CP-ACK for that"); + dtap_expect_tx("0904"); + expect_bssap_clear(); + ms_sends_msg("890106020041020000"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("SMS is done, conn is gone"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("subscriber detaches"); + expect_bssap_clear(); + ms_sends_msg("050130089910070000006402"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); bss_sends_clear_complete(); EXPECT_CONN_COUNT(0); @@ -1114,6 +1508,7 @@ test_ciph_imeisv, test_ciph_tmsi_imei, test_gsm_ciph_in_umts_env, - test_a5_3_not_supported, + test_a5_3_supported, + test_cm_service_needs_classmark_update, NULL }; diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 6a00669..4a13b68 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -2260,7 +2260,7 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 -===== test_a5_3_not_supported +===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST new conn @@ -2309,7 +2309,7 @@ lu_result_sent == 0 auth_request_sent == 1 --- -- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- alas, no matching cipher can be found, abort and release +- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) @@ -2326,23 +2326,98 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode +DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH +DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 +DMSC Looking for A subscriber: conn_id 0 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CLASSMARK_UPDATE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND IMSI:901700000004620 -DMSC CLASSMARK 2 unknown, assuming MS doesn't support A5/3 -DMM IMSI:901700000004620: cannot start ciphering, no intersection between MSC-configured and MS-supported A5 algorithms -- ERROR sending ciphering mode command: rc=-95 -DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Failed to send Ciphering Mode Command -- sending LU Reject for IMSI:901700000004620, cause 17 -DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_DONE -DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_CN_CLOSE -DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_RELEASING -DREF IMSI:901700000004620: MSC conn use + release == 2 (0x102: dtap,release) +- sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 61855fb81fc2a800 + lu_result_sent == 0 +- MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR IMSI:901700000004620: CIPHERING MODE COMPLETE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804032443f2 +DVLR GSUP rx 17: 10010809710000004026f00804032443f2 DREF VLR subscr IMSI:901700000004620 usage increases to: 2 -DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR IMSI:901700000004620 has MSISDN:42342 +DVLR SUBSCR(MSISDN:42342) VLR: update for IMSI=901700000004620 (MSISDN=42342, used=2) +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +- sending LU Accept for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 - BSSAP Clear --RAN_GERAN_A--> MS -DREF IMSI:901700000004620: MSC conn use - dtap == 1 (0x100: release) - lu_result_sent == 2 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + bssap_clear_sent == 1 +- LU was successful, and the conn has already been closed + lu_result_sent == 1 - BSS sends BSSMAP Clear Complete -DREF IMSI:901700000004620: MSC conn use - release == 0 (0x0: ) +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -2351,13 +2426,827 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated -DRLL IMSI:901700000004620: Freeing subscriber connection -DREF VLR subscr IMSI:901700000004620 usage decreases to: 0 -DREF freeing VLR subscr IMSI:901700000004620 +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated llist_count(&net->subscr_conns) == 0 -===== test_a5_3_not_supported: SUCCESS +--- +- after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) +DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=1 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=1 auth_types=0x1 and... +- ...rand=12aca96fb4ffdea5c985cbafa9b6e18b +- ...expecting sres=20bde240 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 + cm_service_result_sent == 0 +- needs auth, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3, so no need to request Classmark Update. + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: 20bde240 (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 07fa7502e07e1c00 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + cm_service_result_sent == 0 + cipher_mode_cmd_sent == 1 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DREF MSISDN:42342: MSC conn use + cm_service == 1 (0x8: cm_service) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +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 + cm_service_result_sent == 0 +- Concluding CM Service Request +DREF MSISDN:42342: MSC conn use - cm_service == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + bssap_clear_sent == 1 +- all requests serviced, conn has been released +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- an SMS is sent, MS is paged +DREF VLR subscr MSISDN:42342 usage increases to: 2 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DMM Subscriber MSISDN:42342 not paged yet, start paging. + RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 + strcmp(paging_expecting_imsi, imsi) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 + paging_sent == 1 + paging_stopped == 0 +- the subscriber and its pending request should remain +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +- MS replies with Paging Response, and VLR sends Auth Request with third key + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) +DRR PAGING RESPONSE: MI(IMSI)=901700000004620 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=2 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... +- ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 +- ...expecting sres=a29514ae +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 +- needs auth, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Authen Response, VLR accepts and requests Ciphering + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: a29514ae (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: e2b234f807886400 +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + cipher_mode_cmd_sent == 1 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DPAG Paging success for MSISDN:42342 (event=0) +DPAG Calling paging cbfn. +DCC (ti 00 sub MSISDN:42342 callref 40000004) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS + dtap_tx_confirmed == 1 + paging_stopped == 1 +- SMS was delivered, no requests pending for subscr +DREF VLR subscr MSISDN:42342 usage increases to: 5 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +- conn is still open to wait for SMS ack dance + llist_count(&net->subscr_conns) == 1 +- MS replies with CP-ACK for received SMS + MSC <--RAN_GERAN_A-- MS: SMS:0x04 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_COMMUNICATING +DREF MSISDN:42342: MSC conn use - dtap == 1 (0x20: trans_sms) + llist_count(&net->subscr_conns) == 1 +- MS also sends RP-ACK, MSC in turn sends CP-ACK for that + MSC <--RAN_GERAN_A-- MS: SMS:0x01 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF MSISDN:42342: MSC conn use - trans_sms == 1 (0x2: dtap) +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + dtap_tx_confirmed == 1 + bssap_clear_sent == 1 +- SMS is done, conn is gone +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- subscriber detaches + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) +DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DMM IMSI DETACH for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 0 +DREF freeing VLR subscr MSISDN:42342 +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING +DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) +- BSSAP Clear --RAN_GERAN_A--> MS +DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF unknown: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DRLL Freeing subscriber connection with NULL subscriber +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +===== test_a5_3_supported: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 12 + +===== test_cm_service_needs_classmark_update +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR GSUP tx: 08010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DVLR GSUP rx 191: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI:901700000004620) Received 5 auth tuples +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for IMSI:901700000004620: tuple use_count=1 key_seq=0 auth_types=0x1 and... +- ...rand=585df1ae287f6e273dce07090d61320b +- ...expecting sres=2d8b2c3e +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 + auth_request_sent == 1 +--- +- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM IMSI:901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI:901700000004620) AUTH on GERAN received SRES/RES: 2d8b2c3e (4 bytes) +DVLR SUBSCR(IMSI:901700000004620) AUTH established GSM security context +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode +DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH +DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 +DMSC Looking for A subscriber: conn_id 0 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CLASSMARK_UPDATE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DMM -> CIPHER MODE COMMAND IMSI:901700000004620 +- sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 61855fb81fc2a800 + lu_result_sent == 0 +- MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR IMSI:901700000004620: CIPHERING MODE COMPLETE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804032443f2 +DVLR GSUP rx 17: 10010809710000004026f00804032443f2 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR IMSI:901700000004620 has MSISDN:42342 +DVLR SUBSCR(MSISDN:42342) VLR: update for IMSI=901700000004620 (MSISDN=42342, used=2) +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +- sending LU Accept for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +- BSSAP Clear --RAN_GERAN_A--> MS +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + bssap_clear_sent == 1 +- LU was successful, and the conn has already been closed + lu_result_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) +DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=1 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=1 auth_types=0x1 and... +- ...rand=12aca96fb4ffdea5c985cbafa9b6e18b +- ...expecting sres=20bde240 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 + cm_service_result_sent == 0 +- needs auth, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3, so no need to request Classmark Update. + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: 20bde240 (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 07fa7502e07e1c00 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + cm_service_result_sent == 0 + cipher_mode_cmd_sent == 1 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DREF MSISDN:42342: MSC conn use + cm_service == 1 (0x8: cm_service) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +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 + cm_service_result_sent == 0 +- Concluding CM Service Request +DREF MSISDN:42342: MSC conn use - cm_service == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + bssap_clear_sent == 1 +- all requests serviced, conn has been released +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- an SMS is sent, MS is paged +DREF VLR subscr MSISDN:42342 usage increases to: 2 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DMM Subscriber MSISDN:42342 not paged yet, start paging. + RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 + strcmp(paging_expecting_imsi, imsi) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 + paging_sent == 1 + paging_stopped == 0 +- the subscriber and its pending request should remain +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +- MS replies with Paging Response, and VLR sends Auth Request with third key + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) +DRR PAGING RESPONSE: MI(IMSI)=901700000004620 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=2 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... +- ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 +- ...expecting sres=a29514ae +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 +--- +- Fake a situation where Classmark 2 is unknown during proc_arq_fsm +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +- MS sends Authen Response, VLR accepts and requests Ciphering +- MS sends Authen Response, VLR accepts and requests Ciphering. Normally, we'd know Classmark 3, but this test removed it. Hence a Classmark Request is generated. + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: a29514ae (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM MSISDN:42342: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED +- BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 +DMSC Looking for A subscriber: conn_id 0 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CLASSMARK_UPDATE +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: e2b234f807886400 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false +- MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DPAG Paging success for MSISDN:42342 (event=0) +DPAG Calling paging cbfn. +DCC (ti 00 sub MSISDN:42342 callref 40000005) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS + dtap_tx_confirmed == 1 + paging_stopped == 1 +- SMS was delivered, no requests pending for subscr +DREF VLR subscr MSISDN:42342 usage increases to: 5 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +- conn is still open to wait for SMS ack dance + llist_count(&net->subscr_conns) == 1 +- MS replies with CP-ACK for received SMS + MSC <--RAN_GERAN_A-- MS: SMS:0x04 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_COMMUNICATING +DREF MSISDN:42342: MSC conn use - dtap == 1 (0x20: trans_sms) + llist_count(&net->subscr_conns) == 1 +- MS also sends RP-ACK, MSC in turn sends CP-ACK for that + MSC <--RAN_GERAN_A-- MS: SMS:0x01 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF MSISDN:42342: MSC conn use - trans_sms == 1 (0x2: dtap) +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + dtap_tx_confirmed == 1 + bssap_clear_sent == 1 +- SMS is done, conn is gone +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- subscriber detaches + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) +DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DMM IMSI DETACH for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 0 +DREF freeing VLR subscr MSISDN:42342 +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING +DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) +- BSSAP Clear --RAN_GERAN_A--> MS +DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF unknown: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DRLL Freeing subscriber connection with NULL subscriber +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +===== test_cm_service_needs_classmark_update: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index c5ab059..ddb6324 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -292,9 +292,79 @@ comment_end(); } +static void test_classmark_update_timeout() +{ + comment_start(); + + fake_time_start(); + + /* implicit: net->authentication_required = true; */ + net->a5_encryption_mask = (1 << 3); /* A5/3 */ + + btw("Location Update request causes a GSUP Send Auth Info request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("08010809710000004026f0"); + ms_sends_msg("050802008168000130089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS"); + /* Based on a Ki of 000102030405060708090a0b0c0d0e0f */ + auth_request_sent = false; + auth_request_expect_rand = "585df1ae287f6e273dce07090d61320b"; + auth_request_expect_autn = NULL; + gsup_rx("0a" + /* imsi */ + "0108" "09710000004026f0" + /* TL TL rand */ + "0322" "2010" "585df1ae287f6e273dce07090d61320b" + /* TL sres TL kc */ + "2104" "2d8b2c3e" "2208" "61855fb81fc2a800" + , + NULL); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + BTW("MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS" + " -- but needs Classmark 2 to determine whether A5/3 is supported"); + cipher_mode_cmd_sent = false; + ms_sends_msg("05542d8b2c3e"); + OSMO_ASSERT(!cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + BTW("But the BSSMAP Classmark Update never arrives"); + btw("At first, we're still waiting"); + fake_time_passes(0, 423); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + expect_bssap_clear(); + fake_time_passes(1, 235); + btw("SUBSCR_CONN_TIMEOUT has passed, conn is gone."); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); + + comment_end(); +} + + msc_vlr_test_func_t msc_vlr_tests[] = { test_ms_timeout_lu_auth_resp, test_ms_timeout_cm_auth_resp, test_ms_timeout_paging, + test_classmark_update_timeout, NULL }; diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index eb40a97..43eb3d4 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -554,6 +554,136 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 +===== test_classmark_update_timeout +- Total time passed: 0.000000 s +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR GSUP tx: 08010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a800 +DVLR GSUP rx 47: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a800 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI:901700000004620) Received 1 auth tuples +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for IMSI:901700000004620: tuple use_count=1 key_seq=0 auth_types=0x1 and... +- ...rand=585df1ae287f6e273dce07090d61320b +- ...expecting sres=2d8b2c3e +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 + auth_request_sent == 1 +--- +- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM IMSI:901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI:901700000004620) AUTH on GERAN received SRES/RES: 2d8b2c3e (4 bytes) +DVLR SUBSCR(IMSI:901700000004620) AUTH established GSM security context +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode +DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH +DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +--- +- But the BSSMAP Classmark Update never arrives +- At first, we're still waiting +- Total time passed: 0.000423 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 1.000658 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 2.000893 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 3.001128 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 4.001363 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 5.001598 s +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Timeout of T0 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Close event, cause: CONGESTION +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_RELEASING +DREF IMSI:901700000004620: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +- sending LU Reject for IMSI:901700000004620, cause 22 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Event SUBSCR_CONN_E_CN_CLOSE not permitted +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +- BSSAP Clear --RAN_GERAN_A--> MS +- SUBSCR_CONN_TIMEOUT has passed, conn is gone. + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF IMSI:901700000004620: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated +DRLL IMSI:901700000004620: Freeing subscriber connection +DREF VLR subscr IMSI:901700000004620 usage decreases to: 0 +DREF freeing VLR subscr IMSI:901700000004620 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 + lu_result_sent == 2 +===== test_classmark_update_timeout: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 12 + full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index bf1b200..1192cf2 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -35,6 +35,7 @@ #include #include #include +#include #if BUILD_IU #include @@ -111,10 +112,10 @@ struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex) { - struct msgb *msg = msgb_alloc(size, label); + struct msgb *msg = msgb_alloc_headroom(size, 4, label); unsigned char *rc; - msg->l2h = msg->head; - rc = msgb_put(msg, osmo_hexparse(hex, msg->head, msgb_tailroom(msg))); + msg->l2h = msg->data; + rc = msgb_put(msg, osmo_hexparse(hex, msg->data, msgb_tailroom(msg))); OSMO_ASSERT(rc == msg->l2h); return msg; } @@ -240,7 +241,32 @@ msg = msgb_from_hex("ms_sends_msg", 1024, hex); msg->l1h = msg->l2h = msg->l3h = msg->data; rx_from_ms(msg); - talloc_free(msg); + msgb_free(msg); +} + +void bss_sends_bssap_mgmt(const char *hex) +{ + struct msgb *msg; + struct bssmap_header *bh; + struct a_conn_info a_conn_info; + + msg = msgb_from_hex("bss_sends_bssap_mgmt", 1024, hex); + msg->l3h = msg->data; + + msg->l2h = msgb_push(msg, sizeof(*bh)); + bh = (void*)msg->l2h; + bh->type = BSSAP_MSG_BSS_MANAGEMENT; + bh->length = msgb_l3len(msg); + + if (g_conn && !conn_exists(g_conn)) + g_conn = NULL; + + OSMO_ASSERT(g_conn); + a_conn_info.network = net; + a_conn_info.conn_id = g_conn->a.conn_id; + + a_sccp_rx_dt((struct osmo_sccp_user*)0x1, &a_conn_info, msg); + msgb_free(msg); } static int ms_sends_msg_fake(uint8_t pdisc, uint8_t msg_type) @@ -363,6 +389,33 @@ paging_stopped = true; } + +/* override, requires '-Wl,--wrap=osmo_sccp_tx_data_msg' */ +int __real_osmo_sccp_tx_data_msg(struct osmo_sccp_user *scu, uint32_t conn_id, + struct msgb *msg); +int __wrap_osmo_sccp_tx_data_msg(struct osmo_sccp_user *scu, uint32_t conn_id, + struct msgb *msg) +{ + const char *proto_str; + const char *msg_str = gsm0808_bssmap_name(msg->l3h[2]); + switch (*msg->l3h) { + case BSSAP_MSG_BSS_MANAGEMENT: + proto_str = "BSSAP-BSS-MANAGEMENT"; + break; + case BSSAP_MSG_DTAP: + proto_str = "BSSAP-DTAP"; + break; + default: + proto_str = ""; + msg_str = ""; + break; + } + + log("BSC <--%s-- MSC: %s %s", proto_str, msg_str, msgb_hexdump(msg)); + msgb_free(msg); + return 0; +} + void clear_vlr() { struct vlr_subscr *vsub, *n; diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 4ca05d2..cc200bd 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -161,6 +161,7 @@ void paging_expect_imsi(const char *imsi); void paging_expect_tmsi(uint32_t tmsi); +void bss_sends_bssap_mgmt(const char *hex); void ms_sends_msg(const char *hex); void ms_sends_security_mode_complete(); void gsup_rx(const char *rx_hex, const char *expect_tx_hex); -- To view, visit https://gerrit.osmocom.org/10987 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: I73c7cb6a86624695bd9c0f59abb72e2fdc655131 Gerrit-Change-Number: 10987 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 03:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 17 Sep 2018 03:19:41 +0000 Subject: Change in osmo-sgsn[master]: sgsn: use gtp_clear_queues() when reset sgsn state Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10988 Change subject: sgsn: use gtp_clear_queues() when reset sgsn state ...................................................................... sgsn: use gtp_clear_queues() when reset sgsn state Allow ttcn3 to flush the gtp queue between each test. Fixes ttcn3 test SGSN_Tests.TC_attach_pdp_act_deact_mt_t3395_expire Change-Id: I49d70cb7abe5cbe92ea68882fa68eccec0e79586 --- M src/gprs/sgsn_vty.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/88/10988/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 057be9f..154e576 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -823,6 +823,9 @@ bssgp_flush_all_queues(); vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE); + gtp_clear_queues(sgsn->gsn); + vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE); + /* remove all queues to bssgp */ return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10988 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: I49d70cb7abe5cbe92ea68882fa68eccec0e79586 Gerrit-Change-Number: 10988 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 05:31:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Sep 2018 05:31:58 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10986 ) Change subject: msc_vlr_tests: cosmetically tweak perm algo printing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10986 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: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 Gerrit-Change-Number: 10986 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 05:31:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 05:37:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Sep 2018 05:37:58 +0000 Subject: Change in osmo-msc[master]: A5/n Ciph: request Classmark Update if missing In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10987 ) Change subject: A5/n Ciph: request Classmark Update if missing ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10987/1/tests/msc_vlr/msc_vlr_test_gsm_ciph.c File tests/msc_vlr/msc_vlr_test_gsm_ciph.c: https://gerrit.osmocom.org/#/c/10987/1/tests/msc_vlr/msc_vlr_test_gsm_ciph.c at 1424 PS1, Line 1424: ws -- To view, visit https://gerrit.osmocom.org/10987 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: I73c7cb6a86624695bd9c0f59abb72e2fdc655131 Gerrit-Change-Number: 10987 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 05:37:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 05:38:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Sep 2018 05:38:08 +0000 Subject: Change in osmo-msc[master]: store classmark in vlr_subscr, not conn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10985 ) Change subject: store classmark in vlr_subscr, not conn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10985 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: I27081bf6e9e017923b2d02607f7ea06beddad82a Gerrit-Change-Number: 10985 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 05: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 Mon Sep 17 07:56:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 07:56:47 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 2: I think since we don't plan to have binaries with spaces in path is not worth spending time changing the logic in the osmo-gsm-tester script. This patch is good though. Note too that osmocon is nowadays installed in /sbin too, I don't know if there's some point in installing it there or we should move it to /bin too. -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 07:56:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 08:04:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 08:04:08 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 2: > Note too that osmocon is nowadays installed in /sbin too, I don't > know if there's some point in installing it there or we should move > it to /bin too. It should move to /bin, I guess. Maybe create an issue with an overall audit of binary install locations? -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 08:04:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 08:04:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 08:04:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Add CBCH_Block definition of TS 04.12 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10982 ) Change subject: GSM_Types: Add CBCH_Block definition of TS 04.12 ...................................................................... GSM_Types: Add CBCH_Block definition of TS 04.12 Change-Id: Ib034aba11a0219959c4224238e559ba36e95cacf --- M library/GSM_Types.ttcn M library/General_Types.ttcn 2 files changed, 43 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 53208e5..88be975 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -207,6 +207,48 @@ } } + +/* TS 04.12 Section 3.3.1 Block type */ +type record CBCH_BlockType { + BIT1 spare, + BIT2 lpd, + boolean last_block, + uint4_t seq_nr +}; +template (value) CBCH_BlockType ts_CBCH_BlockType(template (value) uint4_t seq_nr, template (value) boolean last_block) := { + spare := '0'B, + lpd := '01'B, + last_block := last_block, + seq_nr := seq_nr +}; +template CBCH_BlockType tr_CBCH_BlockType(template uint4_t seq_nr := ?, template boolean last_block := ?) := { + spare := '0'B, + lpd := '01'B, + last_block := last_block, + seq_nr := seq_nr +}; + +/* TS 04.12 Section 3.3 */ +type record CBCH_Block { + CBCH_BlockType block_type, + OCT22 payload +}; +template (value) CBCH_Block ts_CBCH_Block(template (value) uint4_t seq_nr, template (value) boolean last_block, template (value) OCT22 payload) := { + block_type := ts_CBCH_BlockType(seq_nr, last_block), + payload := payload +}; +template CBCH_Block tr_CBCH_Block(template uint4_t seq_nr := ?, template boolean last_block := ?, template OCT22 payload := ?) := { + block_type := tr_CBCH_BlockType(seq_nr, last_block), + payload := payload +}; + + +external function enc_CBCH_Block(in CBCH_Block msg) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_CBCH_Block(in octetstring stream) return CBCH_Block + with { extension "prototype(convert) decode(RAW)" }; + + /* Convert RF signal level in dBm to RxLev (TS 45.008 Chapter 8.1.4) */ function dbm2rxlev(integer dbm) return uint6_t { var integer rxlev := dbm + 110; diff --git a/library/General_Types.ttcn b/library/General_Types.ttcn index 83b2a42..612d5c7 100644 --- a/library/General_Types.ttcn +++ b/library/General_Types.ttcn @@ -233,6 +233,7 @@ type octetstring OCT18 length(18) with { variant "FIELDLENGTH(18)" }; type octetstring OCT19 length(19) with { variant "FIELDLENGTH(19)" }; type octetstring OCT20 length(20) with { variant "FIELDLENGTH(20)" }; + type octetstring OCT22 length(22) with { variant "FIELDLENGTH(22)" }; type octetstring OCT32 length(32) with { variant "FIELDLENGTH(32)" }; type octetstring OCT34 length(34) with { variant "FIELDLENGTH(34)" }; type octetstring OCT46 length(46) with { variant "FIELDLENGTH(46)" }; -- To view, visit https://gerrit.osmocom.org/10982 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: Ib034aba11a0219959c4224238e559ba36e95cacf Gerrit-Change-Number: 10982 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 Mon Sep 17 08:04:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:04:57 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add overload to clone repo and build in subdirectory In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10970 ) Change subject: build: Add overload to clone repo and build in subdirectory ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10970 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: I67fbd54296f2c68316bf8e89cfeb37d147193d53 Gerrit-Change-Number: 10970 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 08:04:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 08:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:07:23 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add script to build the mobile application In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10971 ) Change subject: build: Add script to build the mobile application ...................................................................... Patch Set 1: Code-Review-1 This should go into jenkins-build-osmocom-bb.sh, not an extra build job. Is there any reason not to put it there? We already have lots of build jobs and .tar.gz and have to copy them every time we run an osmo-gsm-tester job, so I'd prefer keep them at 1 per git repo as much as possible. -- To view, visit https://gerrit.osmocom.org/10971 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: I2c537e56aa982b0b4a703fa78c77ade507738b68 Gerrit-Change-Number: 10971 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 08:07: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 Sep 17 08:07:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:07:57 +0000 Subject: Change in osmo-gsm-tester[master]: Add script to build virt_phy of OsmocomBB In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10972 ) Change subject: Add script to build virt_phy of OsmocomBB ...................................................................... Patch Set 1: Code-Review-1 Same for this one. -- To view, visit https://gerrit.osmocom.org/10972 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: I1f14ce43db2f5e16f94dc975e7496dceb4f4b72a Gerrit-Change-Number: 10972 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 08:07:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 08:30:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:30:51 +0000 Subject: Change in libsmpp34[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10989 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. Related: OS#3449 Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/89/10989/1 diff --git a/debian/rules b/debian/rules index 4f472a7..3e8938e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,6 @@ override_dh_strip: dh_strip --dbg-package=libsmpp34-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/10989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe Gerrit-Change-Number: 10989 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 Sep 17 08:42:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:42:26 +0000 Subject: Change in libgtpnl[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10990 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. Related: OS#3449 Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/90/10990/1 diff --git a/debian/rules b/debian/rules index 0d602e5..616f96d 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,3 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) - -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf -- To view, visit https://gerrit.osmocom.org/10990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975 Gerrit-Change-Number: 10990 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 Sep 17 08:44:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:44:35 +0000 Subject: Change in libusrp[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10991 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. Related: OS#3449 Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/91/10991/1 diff --git a/debian/rules b/debian/rules index 04669b3..5835e95 100755 --- a/debian/rules +++ b/debian/rules @@ -12,10 +12,6 @@ %: dh $@ --with autoreconf --fail-missing -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-doxygen -- To view, visit https://gerrit.osmocom.org/10991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99 Gerrit-Change-Number: 10991 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 Sep 17 08:45:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:45:51 +0000 Subject: Change in libasn1c[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10992 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. Related: OS#3449 Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/92/10992/1 diff --git a/debian/rules b/debian/rules index a1039b0..bb73059 100755 --- a/debian/rules +++ b/debian/rules @@ -47,10 +47,6 @@ %: dh $@ --with autoreconf -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # debmake generated override targets # Set options for ./configure #CONFIGURE_FLAGS = -- To view, visit https://gerrit.osmocom.org/10992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19 Gerrit-Change-Number: 10992 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 Sep 17 08:47:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 08:47:48 +0000 Subject: Change in openbsc[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10993 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. Related: OS#3449 Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f --- M debian/rules 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/93/10993/1 diff --git a/debian/rules b/debian/rules index e37a262..dc609f9 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,6 @@ dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg override_dh_auto_configure: - echo $(VERSION) > openbsc/.tarball-version dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system # Print test results in case of a failure -- To view, visit https://gerrit.osmocom.org/10993 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: Ice1875bbd051f78b4a3bcadef48e639419b55e8f Gerrit-Change-Number: 10993 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 Sep 17 10:24:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 10:24:20 +0000 Subject: Change in openbsc[master]: mgcp: Fix osmux_cid_bitmap static array size calculation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10994 Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... mgcp: Fix osmux_cid_bitmap static array size calculation Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is 256 which fits array boundaries correctly (multiple of 8). However, if for example OSMUC_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd have an undesired memory access when accessing last 4 CIDs. Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/94/10994/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 8a802f5..ca0ed30 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -545,7 +545,7 @@ } /* bsc-nat allocates/releases the Osmux circuit ID */ -static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8]; +static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8]; int osmux_used_cid(void) { -- To view, visit https://gerrit.osmocom.org/10994 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: I5908ee44404686e68d61f255b7014af39c8f5703 Gerrit-Change-Number: 10994 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 Sep 17 10:28:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:28:27 +0000 Subject: Change in libusrp[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/10991 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99 Gerrit-Change-Number: 10991 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10:28: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 Sep 17 10:28:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:28:28 +0000 Subject: Change in libusrp[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/10991 ) 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. Related: OS#3449 Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99 --- 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 04669b3..5835e95 100755 --- a/debian/rules +++ b/debian/rules @@ -12,10 +12,6 @@ %: dh $@ --with autoreconf --fail-missing -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-doxygen -- To view, visit https://gerrit.osmocom.org/10991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99 Gerrit-Change-Number: 10991 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 Sep 17 10:28:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:28:39 +0000 Subject: Change in libgtpnl[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/10990 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975 Gerrit-Change-Number: 10990 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10:28: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 Sep 17 10:28:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:28:41 +0000 Subject: Change in libgtpnl[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/10990 ) 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. Related: OS#3449 Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975 --- 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 0d602e5..616f96d 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,3 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) - -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf -- To view, visit https://gerrit.osmocom.org/10990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975 Gerrit-Change-Number: 10990 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 Sep 17 10:28:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:28:58 +0000 Subject: Change in libsmpp34[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/10989 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe Gerrit-Change-Number: 10989 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10:28:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 10:28:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:28:59 +0000 Subject: Change in libsmpp34[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/10989 ) 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. Related: OS#3449 Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe --- 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 4f472a7..3e8938e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,6 @@ override_dh_strip: dh_strip --dbg-package=libsmpp34-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/10989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe Gerrit-Change-Number: 10989 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 Sep 17 10:29:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:29:05 +0000 Subject: Change in libasn1c[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/10992 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19 Gerrit-Change-Number: 10992 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10:29: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 Sep 17 10:29:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:29:06 +0000 Subject: Change in libasn1c[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/10992 ) 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. Related: OS#3449 Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19 --- 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 a1039b0..bb73059 100755 --- a/debian/rules +++ b/debian/rules @@ -47,10 +47,6 @@ %: dh $@ --with autoreconf -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # debmake generated override targets # Set options for ./configure #CONFIGURE_FLAGS = -- To view, visit https://gerrit.osmocom.org/10992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19 Gerrit-Change-Number: 10992 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 Sep 17 10:29:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:29:13 +0000 Subject: Change in openbsc[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/10993 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10993 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: Ice1875bbd051f78b4a3bcadef48e639419b55e8f Gerrit-Change-Number: 10993 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10:29:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 10:29:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:29:14 +0000 Subject: Change in openbsc[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/10993 ) 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. Related: OS#3449 Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f --- M debian/rules 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index e37a262..dc609f9 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,6 @@ dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg override_dh_auto_configure: - echo $(VERSION) > openbsc/.tarball-version dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system # Print test results in case of a failure -- To view, visit https://gerrit.osmocom.org/10993 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: Ice1875bbd051f78b4a3bcadef48e639419b55e8f Gerrit-Change-Number: 10993 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 Sep 17 10:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:29:42 +0000 Subject: Change in openbsc[master]: mgcp: Fix osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10994 ) Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10994 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: I5908ee44404686e68d61f255b7014af39c8f5703 Gerrit-Change-Number: 10994 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10: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 Mon Sep 17 10:33:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:33:10 +0000 Subject: Change in osmo-msc[master]: store classmark in vlr_subscr, not conn In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10985 ) Change subject: store classmark in vlr_subscr, not conn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10985 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: I27081bf6e9e017923b2d02607f7ea06beddad82a Gerrit-Change-Number: 10985 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 10:33:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 10:33:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:33:37 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10986 ) Change subject: msc_vlr_tests: cosmetically tweak perm algo printing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10986 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: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 Gerrit-Change-Number: 10986 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 10:33: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 Sep 17 10:35:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 10:35:13 +0000 Subject: Change in openbsc[master]: mgcp: Fix osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10994 ) Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... mgcp: Fix osmux_cid_bitmap static array size calculation Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is 256 which fits array boundaries correctly (multiple of 8). However, if for example OSMUC_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd have an undesired memory access when accessing last 4 CIDs. Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 8a802f5..ca0ed30 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -545,7 +545,7 @@ } /* bsc-nat allocates/releases the Osmux circuit ID */ -static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8]; +static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8]; int osmux_used_cid(void) { -- To view, visit https://gerrit.osmocom.org/10994 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: I5908ee44404686e68d61f255b7014af39c8f5703 Gerrit-Change-Number: 10994 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 Sep 17 10:35:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:35:49 +0000 Subject: Change in osmo-msc[master]: A5/n Ciph: request Classmark Update if missing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10987 ) Change subject: A5/n Ciph: request Classmark Update if missing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10987 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: I73c7cb6a86624695bd9c0f59abb72e2fdc655131 Gerrit-Change-Number: 10987 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 10:35: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 Sep 17 10:36:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:36:05 +0000 Subject: Change in osmo-msc[master]: store classmark in vlr_subscr, not conn In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10985 ) Change subject: store classmark in vlr_subscr, not conn ...................................................................... store classmark in vlr_subscr, not conn Store all Classmark information in the VLR. So, we now always know the Classmark 1 (mandatory IE for LU). This is visible in the msc_vlr_tests -- they no longer indicate "assuming A5/1 is supported" because classmark 1 is missing, because we now know the Classmark 1. Rationale: During Location Updating, we receive Classmark 1; during CM Service Request and Paging Response, we receive Classmark 2. So far we stored these only for the duration of the conn, so as soon as a LU is complete, we would forget CM1. In other words, for anything else than a LU Request, we had no Classmark 1 available at all. During Ciphering Mode Command, we rely on Classmark 1 to determine whether A5/1 is supported. That is moot if we don't even have a Classmark 1 for any CM Service Request or Paging Response initiated connections. The only reason that A5/1 worked is that we assume A5/1 to work if Classmark 1 is missing. To add to the confusion, if a phone indicated that it did *not* support A5/1 in the Classmark 1, according to spec we're supposed to not service it at all. A code comment however says that we instead want to heed the flag -- which so far was only present in a Location Updating initiated connection. Now we can make this decision without assuming things. This got my attention while hacking on sending a BSSMAP Classmark Request from the MSC if it finds missing Classmark information, and was surprised to see it it lacking CM1 to decide about A5/1. Change-Id: I27081bf6e9e017923b2d02607f7ea06beddad82a --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_rest.err 6 files changed, 75 insertions(+), 69 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/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 27f7fc5..ffe3afc 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -127,8 +127,6 @@ /* connected via 2G or 3G? */ enum ran_type via_ran; - struct gsm_classmark classmark; - uint16_t lac; struct gsm_encr encr; diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 386a548..d52713c 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -174,6 +174,8 @@ uint8_t lac; enum ran_type attached_via_ran; } cs; + + struct gsm_classmark classmark; }; enum vlr_ciph { diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 19b0572..b942a03 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -98,14 +98,25 @@ return gsm48_conn_sendmsg(msg, conn, NULL); } +static bool classmark1_is_r99(const struct gsm48_classmark1 *cm1) +{ + return cm1->rev_lev >= 2; +} + +static bool classmark2_is_r99(const uint8_t *cm2, uint8_t cm2_len) +{ + uint8_t rev_lev; + if (!cm2_len) + return false; + rev_lev = (cm2[0] >> 5) & 0x3; + return rev_lev >= 2; +} + static bool classmark_is_r99(struct gsm_classmark *cm) { - int rev_lev = 0; if (cm->classmark1_set) - rev_lev = cm->classmark1.rev_lev; - else if (cm->classmark2_len > 0) - rev_lev = (cm->classmark2[0] >> 5) & 0x3; - return rev_lev >= 2; + return classmark1_is_r99(&cm->classmark1); + return classmark2_is_r99(cm->classmark2, cm->classmark2_len); } /* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher */ @@ -345,9 +356,6 @@ msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string); - conn->classmark.classmark1 = lu->classmark1; - conn->classmark.classmark1_set = true; - DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n", gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type)); @@ -402,7 +410,7 @@ &old_lai, &new_lai, is_utran || conn->network->authentication_required, is_utran || conn->network->a5_encryption_mask > 0x01, - classmark_is_r99(&conn->classmark), + classmark1_is_r99(&lu->classmark1), is_utran, net->vlr->cfg.assign_tmsi); if (!lu_fsm) { @@ -421,6 +429,9 @@ return -EIO; } + conn->vsub->classmark.classmark1 = lu->classmark1; + conn->vsub->classmark.classmark1_set = true; + msc_subscr_conn_complete_layer_3(conn); return 0; } @@ -773,8 +784,6 @@ msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_CM_SERVICE_REQ, mi_string); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, mi_p); - memcpy(conn->classmark.classmark2, classmark2, classmark2_len); - conn->classmark.classmark2_len = classmark2_len; is_utran = (conn->via_ran == RAN_UTRAN_IU); vlr_proc_acc_req(conn->fi, @@ -783,9 +792,20 @@ VLR_PR_ARQ_T_CM_SERV_REQ, mi-1, &lai, is_utran || conn->network->authentication_required, is_utran || conn->network->a5_encryption_mask > 0x01, - classmark_is_r99(&conn->classmark), + classmark2_is_r99(classmark2, classmark2_len), is_utran); + /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect + * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ + if (!conn->vsub) { + LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a CM Service Request\n", + mi_string); + return -EIO; + } + + memcpy(conn->vsub->classmark.classmark2, classmark2, classmark2_len); + conn->vsub->classmark.classmark2_len = classmark2_len; + msc_subscr_conn_complete_layer_3(conn); return 0; } @@ -846,11 +866,6 @@ break; } - /* TODO? We used to remember the subscriber's classmark1 here and - * stored it in the old sqlite db, but now we store it in a conn that - * will be discarded anyway: */ - conn->classmark.classmark1 = idi->classmark1; - if (!vsub) { LOGP(DMM, LOGL_ERROR, "IMSI DETACH for unknown subscriber MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); @@ -860,6 +875,9 @@ if (vsub->cs.is_paging) subscr_paging_cancel(vsub, GSM_PAGING_EXPIRED); + /* We already got Classmark 1 during Location Updating ... but well, ok */ + vsub->classmark.classmark1 = idi->classmark1; + vlr_subscr_rx_imsi_detach(vsub); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_DETACHED, vsub); vlr_subscr_put(vsub); @@ -986,7 +1004,7 @@ is_umts ? "UMTS" : "GSM", is_umts ? "res" : "sres", osmo_hexdump_nospc(res, res_len)); - return vlr_subscr_rx_auth_resp(conn->vsub, classmark_is_r99(&conn->classmark), + return vlr_subscr_rx_auth_resp(conn->vsub, classmark_is_r99(&conn->vsub->classmark), conn->via_ran == RAN_UTRAN_IU, res, res_len); } @@ -1128,27 +1146,15 @@ return rc; } -static uint8_t *gsm48_cm2_get_mi(uint8_t *classmark2_lv, unsigned int tot_len) -{ - /* Check the size for the classmark */ - if (tot_len < 1 + *classmark2_lv) - return NULL; - - uint8_t *mi_lv = classmark2_lv + *classmark2_lv + 1; - if (tot_len < 2 + *classmark2_lv + mi_lv[0]) - return NULL; - - return mi_lv; -} - /* Receive a PAGING RESPONSE message from the MS */ static int gsm48_rx_rr_pag_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct gsm_network *net = conn->network; struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_pag_resp *resp; - uint8_t *classmark2_lv = gh->data + 1; - uint8_t *mi_lv; + uint8_t classmark2_len = gh->data[1]; + uint8_t *classmark2 = gh->data+2; + uint8_t *mi_lv = classmark2 + classmark2_len; uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; struct osmo_location_area_id lai; @@ -1158,8 +1164,11 @@ lai.lac = conn->lac; resp = (struct gsm48_pag_resp *) &gh->data[0]; - gsm48_paging_extract_mi(resp, msgb_l3len(msg) - sizeof(*gh), - mi_string, &mi_type); + + if (gsm48_paging_extract_mi(resp, msgb_l3len(msg) - sizeof(*gh), mi_string, &mi_type) <= 0) { + LOGP(DRR, LOGL_ERROR, "PAGING RESPONSE: invalid Mobile Identity\n"); + return -EINVAL; + } if (msc_subscr_conn_is_establishing_auth_ciph(conn)) { LOGP(DMM, LOGL_ERROR, @@ -1174,17 +1183,8 @@ DEBUGP(DRR, "PAGING RESPONSE: MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); - mi_lv = gsm48_cm2_get_mi(classmark2_lv, msgb_l3len(msg) - sizeof(*gh)); - if (!mi_lv) { - LOGP(DRR, LOGL_ERROR, "PAGING RESPONSE: invalid Mobile Identity\n"); - return -1; - } - msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_PAGING_RESP, mi_string); - memcpy(conn->classmark.classmark2, classmark2_lv+1, *classmark2_lv); - conn->classmark.classmark2_len = *classmark2_lv; - is_utran = (conn->via_ran == RAN_UTRAN_IU); vlr_proc_acc_req(conn->fi, SUBSCR_CONN_E_ACCEPTED, SUBSCR_CONN_E_CN_CLOSE, NULL, @@ -1192,9 +1192,20 @@ VLR_PR_ARQ_T_PAGING_RESP, mi_lv, &lai, is_utran || conn->network->authentication_required, is_utran || conn->network->a5_encryption_mask > 0x01, - classmark_is_r99(&conn->classmark), + classmark2_is_r99(classmark2, classmark2_len), is_utran); + /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect + * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ + if (!conn->vsub) { + LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a Paging Response\n", + mi_string); + return -EIO; + } + + memcpy(conn->vsub->classmark.classmark2, classmark2, classmark2_len); + conn->vsub->classmark.classmark2_len = classmark2_len; + msc_subscr_conn_complete_layer_3(conn); return 0; } @@ -1390,10 +1401,10 @@ gh = msgb_l3(msg); pdisc = gsm48_hdr_pdisc(gh); - if (conn->classmark.classmark1_set && conn->classmark.classmark1.rev_lev < 2) { - modulo = gsm0407_determine_nsd_ret_modulo_r98(pdisc, gh->msg_type, &n_sd); - } else { /* R99 */ + if (conn->vsub && classmark_is_r99(&conn->vsub->classmark)) { modulo = gsm0407_determine_nsd_ret_modulo_r99(pdisc, gh->msg_type, &n_sd); + } else { /* pre R99 */ + modulo = gsm0407_determine_nsd_ret_modulo_r98(pdisc, gh->msg_type, &n_sd); } if (modulo == 0) return false; @@ -1618,7 +1629,7 @@ for (i = 0; i < 8; i++) { if (net->a5_encryption_mask & (1 << i) && - classmark_supports_a5(&conn->classmark, i)) + classmark_supports_a5(&conn->vsub->classmark, i)) ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); } ei.perm_algo_len = j; diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index a6618c0..1966043 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -147,23 +147,25 @@ const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) { + struct gsm_classmark *cm = &conn->vsub->classmark; + if (cm2 && cm2_len) { - if (cm2_len > sizeof(conn->classmark.classmark2)) { + if (cm2_len > sizeof(cm->classmark2)) { LOGP(DRR, LOGL_NOTICE, "%s: classmark2 is %u bytes, truncating at %zu bytes\n", - vlr_subscr_name(conn->vsub), cm2_len, sizeof(conn->classmark.classmark2)); - cm2_len = sizeof(conn->classmark.classmark2); + vlr_subscr_name(conn->vsub), cm2_len, sizeof(cm->classmark2)); + cm2_len = sizeof(cm->classmark2); } - conn->classmark.classmark2_len = cm2_len; - memcpy(conn->classmark.classmark2, cm2, cm2_len); + cm->classmark2_len = cm2_len; + memcpy(cm->classmark2, cm2, cm2_len); } if (cm3 && cm3_len) { - if (cm3_len > sizeof(conn->classmark.classmark3)) { + if (cm3_len > sizeof(cm->classmark3)) { LOGP(DRR, LOGL_NOTICE, "%s: classmark3 is %u bytes, truncating at %zu bytes\n", - vlr_subscr_name(conn->vsub), cm3_len, sizeof(conn->classmark.classmark3)); - cm3_len = sizeof(conn->classmark.classmark3); + vlr_subscr_name(conn->vsub), cm3_len, sizeof(cm->classmark3)); + cm3_len = sizeof(cm->classmark3); } - conn->classmark.classmark3_len = cm3_len; - memcpy(conn->classmark.classmark3, cm3, cm3_len); + cm->classmark3_len = cm3_len; + memcpy(cm->classmark3, cm3, cm3_len); } } diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 83723ab..71e34a8 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -237,7 +237,6 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: 07fa7502e07e1c00 @@ -376,7 +375,6 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: e2b234f807886400 @@ -779,7 +777,6 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: 07fa7502e07e1c00 @@ -918,7 +915,6 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 - ...perm algo: 2 - ...key: e2b234f807886400 @@ -2018,7 +2014,6 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 - ...perm algo: 2 - ...key: da149b11d473f400 @@ -2147,7 +2142,6 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 -DMSC CLASSMARK 1 unknown, assuming MS supports A5/1 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 - ...perm algo: 2 - ...key: 26ec67fad3073000 diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index e71295a..395a138 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -71,8 +71,7 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) - BSSAP Clear --RAN_GERAN_A--> MS -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted +DRR 901700000004620: subscriber not allowed to do a CM Service Request DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) bssap_clear_sent == 1 - conn was released -- To view, visit https://gerrit.osmocom.org/10985 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: I27081bf6e9e017923b2d02607f7ea06beddad82a Gerrit-Change-Number: 10985 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr 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 Mon Sep 17 10:36:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:36:06 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10986 ) Change subject: msc_vlr_tests: cosmetically tweak perm algo printing ...................................................................... msc_vlr_tests: cosmetically tweak perm algo printing In the msc_vlr_tests, instead of printing the algo IDs, rather print the corresponding A5/n name, for clarity. Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 --- M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_tests.c 2 files changed, 13 insertions(+), 13 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/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 71e34a8..6a00669 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -68,7 +68,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -238,7 +238,7 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 07fa7502e07e1c00 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -376,7 +376,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: e2b234f807886400 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -571,7 +571,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -778,7 +778,7 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 07fa7502e07e1c00 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -916,7 +916,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:46071 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: e2b234f807886400 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) @@ -1111,7 +1111,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -1352,7 +1352,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=1 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -1582,7 +1582,7 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000004620 - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 61855fb81fc2a800 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) @@ -1856,7 +1856,7 @@ DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND IMSI:901700000010650 - sending Ciphering Mode Command for IMSI:901700000010650: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 7a75f0ac9b844400 DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) @@ -2015,7 +2015,7 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: da149b11d473f400 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) @@ -2143,7 +2143,7 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode DMM -> CIPHER MODE COMMAND MSISDN:42342 - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 -- ...perm algo: 2 +- ...perm algo: A5/1 - ...key: 26ec67fad3073000 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index f8551dd..bf1b200 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -723,7 +723,7 @@ btw("sending Ciphering Mode Command for %s: include_imeisv=%d", vlr_subscr_name(conn->vsub), include_imeisv); for (i = 0; i < ei->perm_algo_len; i++) - btw("...perm algo: %u", ei->perm_algo[i]); + btw("...perm algo: A5/%u", ei->perm_algo[i] - 1); OSMO_ASSERT(ei->key_len <= sizeof(ei->key)); btw("...key: %s", osmo_hexdump_nospc(ei->key, ei->key_len)); cipher_mode_cmd_sent = true; -- To view, visit https://gerrit.osmocom.org/10986 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: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 Gerrit-Change-Number: 10986 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr 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 Mon Sep 17 10:36:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:36:06 +0000 Subject: Change in osmo-msc[master]: A5/n Ciph: request Classmark Update if missing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10987 ) Change subject: A5/n Ciph: request Classmark Update if missing ...................................................................... A5/n Ciph: request Classmark Update if missing When the VLR requests a Ciphering Mode with vlr_ops.set_ciph_mode(), and if we need a ciph algo flag from a Classmark information that is not yet known (usually CM 2 during LU), send a BSSMAP Classmark Request to get it. To manage the intermission of the Classmark Request, add - msc_classmark_request_then_cipher_mode_cmd(), - state SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE, - event SUBSCR_CONN_E_CLASSMARK_UPDATE. >From state AUTH_CIPH, switch to state WAIT_CLASSMARK_UPDATE. Once the BSSMAP Classmark Response, is received, switch back to SUBSCR_CONN_S_AUTH_CIPH and re-initiate Ciphering Mode. To be able to re-enter the Ciphering Mode algo decision, factor it out into msc_geran_set_cipher_mode(). Rationale: In the following commit, essentially we stopped supporting A5/3 ciphering: commit 71330720b6efdda2fcfd3e9c0cb45f89e32e5670 "MSC: Intersect configured A5 algorithms with MS-supported ones" Change-Id: Id124923ee52a357cb7d3e04d33f585214774f3a3 A5/3 was no longer supported because from that commit on, we strictly checked the MS-supported ciphers, but we did not have Classmark 2 available during Location Updating. This patch changes that: when Classmark 2 is missing, actively request it by a BSSMAP Classmark Request; continue Ciphering only after the Response. Always request missing Classmark, even if a lesser cipher were configured available. If the Classmark Update response fails to come in, cause an attach failure. Instead, we could attempt to use a lesser cipher that is also enabled. That is left as a future feature, should that become relevant. I think it's unlikely. Technically, we could now end up requesting a Classmark Updating both during LU (vlr_lu_fsm) and CM Service/Paging Response (proc_arq_fsm), but in practice the only time we lack a Classmark is: during Location Updating with A5/3 enabled. A5/1 support is indicated in CM1 which is always available, and A5/3 support is indicated in CM2, which is always available during CM Service Request as well as Paging Response. So this patch has practical relevance only for Location Updating. For networks that permit only A5/3, this patch fixes Location Updating. For networks that support A5/3 and A5/1, so far we always used A5/1 during LU, and after this patch we request CM2 and likely use A5/3 instead. In msc_vlr_test_gsm_ciph, verify that requesting Classmark 2 for A5/3 works during LU. Also verify that the lack of a Classmark Response results in attach failure. In msc_vlr_test_gsm_ciph, a hacky unit test fakes a situation where a CM2 is missing during proc_arq_fsm and proves that that code path works, even though the practical relevance is currently zero. It would only become interesting if ciphering algorithms A5/4 and higher became relevant, because support of those would be indicated in Classmark 3, which would always require a Classmark Request. Related: OS#3043 Depends: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7 (libosmocore) Change-Id: I73c7cb6a86624695bd9c0f59abb72e2fdc655131 --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c M src/libmsc/subscr_conn.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 14 files changed, 1,757 insertions(+), 75 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/a_iface.h b/include/osmocom/msc/a_iface.h index 217011d..9a758d3 100644 --- a/include/osmocom/msc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -78,6 +78,8 @@ /* Send clear command via A-interface */ int a_iface_tx_clear_cmd(struct gsm_subscriber_connection *conn); +int a_iface_tx_classmark_request(const struct gsm_subscriber_connection *conn); + /* Clear all subscriber connections on a specified BSC * (Helper function for a_iface_bssap.c) */ void a_clear_all(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *bsc_addr); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index ffe3afc..70ac934 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -130,6 +130,13 @@ uint16_t lac; struct gsm_encr encr; + /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still + * wants to request a Classmark Update first. */ + struct { + bool umts_aka; + bool retrieve_imeisv; + } geran_set_cipher_mode; + /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ uint8_t n_sd_next[4]; diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 7b3702a..3ffb65c 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -16,6 +16,8 @@ SUBSCR_CONN_E_INVALID = 0, /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ SUBSCR_CONN_E_COMPLETE_LAYER_3, + /* Received Classmark Update, typically neede for Ciphering Mode Command */ + SUBSCR_CONN_E_CLASSMARK_UPDATE, /* LU or Process Access FSM has determined that this conn is good */ SUBSCR_CONN_E_ACCEPTED, /* received first reply from MS in "real" CC, SMS, USSD communication */ @@ -33,6 +35,7 @@ enum subscr_conn_fsm_state { SUBSCR_CONN_S_NEW, SUBSCR_CONN_S_AUTH_CIPH, + SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE, SUBSCR_CONN_S_ACCEPTED, SUBSCR_CONN_S_COMMUNICATING, SUBSCR_CONN_S_RELEASING, @@ -62,6 +65,9 @@ struct msgb *msg, uint16_t chosen_channel); void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg); +int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, + bool retrieve_imeisv); +int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); void msc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t alg_id); void msc_rx_sec_mode_compl(struct gsm_subscriber_connection *conn); diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 75fa438..bd9b890 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -422,6 +422,16 @@ return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); } +int a_iface_tx_classmark_request(const struct gsm_subscriber_connection *conn) +{ + struct msgb *msg; + + LOGPCONN(conn, LOGL_INFO, "Tx BSSMAP CLASSMARK REQUEST to BSC\n"); + + msg = gsm0808_create_classmark_request(); + return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); +} + /* Callback function: Close all open connections */ static void a_reset_cb(const void *priv) { diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b942a03..564e90b 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -119,13 +119,16 @@ return classmark2_is_r99(cm->classmark2, cm->classmark2_len); } -/* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher */ -static bool classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) +/* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher. + * Return 1 when the given A5/n is permitted, 0 when not, and negative if the respective MS CLASSMARK is + * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not + * available. */ +static int classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) { switch (a5) { case 0: /* all phones must implement A5/0, see 3GPP TS 43.020 4.9 */ - return true; + return 1; case 1: /* 3GPP TS 43.020 4.9 requires A5/1 to be suppored by all phones and actually states: * "The network shall not provide service to an MS which indicates that it does not @@ -134,25 +137,24 @@ /* See 3GPP TS 24.008 10.5.1.7 */ if (!cm->classmark1_set) { DEBUGP(DMSC, "CLASSMARK 1 unknown, assuming MS supports A5/1\n"); - return true; + return -1; } else { if (cm->classmark1.a5_1) - return false; /* Inverted logic for this bit! */ + return 0; /* Inverted logic for this bit! */ else - return true; + return 1; } break; case 2: case 3: /* See 3GPP TS 24.008 10.5.1.6 */ if (cm->classmark2_len < 3) { - DEBUGP(DMSC, "CLASSMARK 2 unknown, assuming MS doesn't support A5/%u\n", a5); - return false; + return -2; } else { if (cm->classmark2[2] & (1 << (a5-2))) - return true; + return 1; else - return false; + return 0; } break; case 4: @@ -161,13 +163,12 @@ case 7: /* See 3GPP TS 24.008 10.5.1.7 */ if (cm->classmark3_len < 1) { - DEBUGP(DMSC, "CLASSMARK 3 unknown, assuming MS doesn't support A5/%u\n", a5); - return false; + return -3; } else { if (cm->classmark3[0] & (1 << (a5-4))) - return true; + return 1; else - return false; + return 0; } break; default: @@ -1592,6 +1593,78 @@ osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); +int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv) +{ + struct gsm_network *net = conn->network; + struct gsm0808_encrypt_info ei; + int i, j = 0; + int request_classmark = 0; + int request_classmark_for_a5_n = 0; + struct gsm_auth_tuple *tuple = conn->vsub->last_tuple; + + if (!conn || !conn->vsub || !conn->vsub->last_tuple) { + /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode() + * already. */ + LOGP(DMM, LOGL_ERROR, "Internal error: missing state during Ciphering Mode Command\n"); + return -EINVAL; + } + + for (i = 0; i < 8; i++) { + int supported; + + /* A5/n permitted by osmo-msc.cfg? */ + if (!(net->a5_encryption_mask & (1 << i))) + continue; + + /* A5/n supported by MS? */ + supported = classmark_supports_a5(&conn->vsub->classmark, i); + if (supported == 1) { + ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); + /* A higher A5/n is supported, so no need to request a Classmark + * for support of a lesser A5/n. */ + request_classmark = 0; + } else if (supported < 0) { + request_classmark = -supported; + request_classmark_for_a5_n = i; + } + } + ei.perm_algo_len = j; + + if (request_classmark) { + /* The highest A5/n as from osmo-msc.cfg might be available, but we are + * still missing the Classmark information for that from the MS. First + * ask for that. */ + LOGP(DMM, LOGL_DEBUG, "%s: to determine whether A5/%d is supported," + " first ask for a Classmark Update to obtain Classmark %d\n", + vlr_subscr_name(conn->vsub), request_classmark_for_a5_n, + request_classmark); + + return msc_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); + } + + if (ei.perm_algo_len == 0) { + LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection " + "between MSC-configured and MS-supported A5 algorithms\n", + vlr_subscr_name(conn->vsub)); + return -ENOTSUP; + } + + DEBUGP(DMM, "-> CIPHER MODE COMMAND %s\n", vlr_subscr_name(conn->vsub)); + + tuple = conn->vsub->last_tuple; + + /* In case of UMTS AKA, the Kc for ciphering must be derived from the 3G auth + * tokens. tuple->vec.kc was calculated from the GSM algorithm and is not + * necessarily a match for the UMTS AKA tokens. */ + if (umts_aka) + osmo_auth_c3(ei.key, tuple->vec.ck, tuple->vec.ik); + else + memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc)); + ei.key_len = sizeof(tuple->vec.kc); + + return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv); +} + /* VLR asks us to start using ciphering. * (Keep non-static to allow regression testing on this function.) */ int msc_vlr_set_ciph_mode(void *msc_conn_ref, @@ -1620,38 +1693,7 @@ switch (conn->via_ran) { case RAN_GERAN_A: - DEBUGP(DMM, "-> CIPHER MODE COMMAND %s\n", - vlr_subscr_name(conn->vsub)); - { - struct gsm_network *net = conn->network; - struct gsm0808_encrypt_info ei; - int i, j = 0; - - for (i = 0; i < 8; i++) { - if (net->a5_encryption_mask & (1 << i) && - classmark_supports_a5(&conn->vsub->classmark, i)) - ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); - } - ei.perm_algo_len = j; - - if (ei.perm_algo_len == 0) { - LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection " - "between MSC-configured and MS-supported A5 algorithms\n", - vlr_subscr_name(conn->vsub)); - return -ENOTSUP; - } - - /* In case of UMTS AKA, the Kc for ciphering must be derived from the 3G auth - * tokens. tuple->vec.kc was calculated from the GSM algorithm and is not - * necessarily a match for the UMTS AKA tokens. */ - if (umts_aka) - osmo_auth_c3(ei.key, tuple->vec.ck, tuple->vec.ik); - else - memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc)); - ei.key_len = sizeof(tuple->vec.kc); - - return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv); - } + return msc_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); case RAN_UTRAN_IU: #ifdef BUILD_IU diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 1966043..8efa16c 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -167,6 +167,10 @@ cm->classmark3_len = cm3_len; memcpy(cm->classmark3, cm3, cm3_len); } + + /* bump subscr conn FSM in case it is waiting for a Classmark Update */ + if (conn->fi->state == SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE) + osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_CLASSMARK_UPDATE, NULL); } /* Receive a CIPHERING MODE COMPLETE from BSC */ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index 2040e36..e6fa7e1 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -45,6 +45,7 @@ static const struct value_string subscr_conn_fsm_event_names[] = { OSMO_VALUE_STRING(SUBSCR_CONN_E_INVALID), OSMO_VALUE_STRING(SUBSCR_CONN_E_COMPLETE_LAYER_3), + OSMO_VALUE_STRING(SUBSCR_CONN_E_CLASSMARK_UPDATE), OSMO_VALUE_STRING(SUBSCR_CONN_E_ACCEPTED), OSMO_VALUE_STRING(SUBSCR_CONN_E_COMMUNICATING), OSMO_VALUE_STRING(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED), @@ -163,6 +164,66 @@ } } +int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, + bool retrieve_imeisv) +{ + int rc; + conn->geran_set_cipher_mode.umts_aka = umts_aka; + conn->geran_set_cipher_mode.retrieve_imeisv = retrieve_imeisv; + + rc = a_iface_tx_classmark_request(conn); + if (rc) { + LOGP(DMM, LOGL_ERROR, "%s: cannot send BSSMAP Classmark Request\n", + vlr_subscr_name(conn->vsub)); + return -EIO; + } + + osmo_fsm_inst_state_chg(conn->fi, SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE, SUBSCR_CONN_TIMEOUT, 0); + return 0; +} + +static void subscr_conn_fsm_wait_classmark_update(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_subscriber_connection *conn = fi->priv; + switch (event) { + case SUBSCR_CONN_E_CLASSMARK_UPDATE: + /* Theoretically, this event can be used for requesting Classmark in various situations. + * So far though, the only time we send a Classmark Request is during Ciphering. As soon + * as more such situations arise, we need to add state to indicate what action should + * follow after a Classmark Update is received (e.g. + * msc_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that + * Ciphering should continue afterwards). But right now, it is accurate to always + * continue with Ciphering: */ + + /* During Ciphering, we needed Classmark information. The Classmark Update has come in, + * go back into the Set Ciphering Command procedure. */ + osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_AUTH_CIPH, SUBSCR_CONN_TIMEOUT, 0); + if (msc_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka, + conn->geran_set_cipher_mode.retrieve_imeisv)) { + LOGPFSML(fi, LOGL_ERROR, + "Sending Cipher Mode Command failed, aborting attach\n"); + vlr_subscr_cancel_attach_fsm(conn->vsub, OSMO_FSM_TERM_ERROR, + GSM48_REJECT_NETWORK_FAILURE); + } + return; + + case SUBSCR_CONN_E_UNUSED: + LOGPFSML(fi, LOGL_DEBUG, "Awaiting results for Auth+Ciph, overruling event %s\n", + osmo_fsm_event_name(fi->fsm, event)); + return; + + case SUBSCR_CONN_E_MO_CLOSE: + case SUBSCR_CONN_E_CN_CLOSE: + log_close_event(fi, event, data); + evaluate_acceptance_outcome(fi, false); + osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_RELEASING, SUBSCR_CONN_TIMEOUT, 0); + return; + + default: + OSMO_ASSERT(false); + } +} + static bool subscr_conn_fsm_has_active_transactions(struct osmo_fsm_inst *fi) { struct gsm_subscriber_connection *conn = fi->priv; @@ -362,10 +423,21 @@ S(SUBSCR_CONN_E_MO_CLOSE) | S(SUBSCR_CONN_E_CN_CLOSE) | S(SUBSCR_CONN_E_UNUSED), - .out_state_mask = S(SUBSCR_CONN_S_ACCEPTED) | + .out_state_mask = S(SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE) | + S(SUBSCR_CONN_S_ACCEPTED) | S(SUBSCR_CONN_S_RELEASING), .action = subscr_conn_fsm_auth_ciph, }, + [SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE] = { + .name = OSMO_STRINGIFY(SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE), + .in_event_mask = S(SUBSCR_CONN_E_CLASSMARK_UPDATE) | + S(SUBSCR_CONN_E_MO_CLOSE) | + S(SUBSCR_CONN_E_CN_CLOSE) | + S(SUBSCR_CONN_E_UNUSED), + .out_state_mask = S(SUBSCR_CONN_S_AUTH_CIPH) | + S(SUBSCR_CONN_S_RELEASING), + .action = subscr_conn_fsm_wait_classmark_update, + }, [SUBSCR_CONN_S_ACCEPTED] = { .name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED), /* allow everything to release for any odd behavior */ diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index e6b20e6..1d1956a 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -35,6 +35,7 @@ -Wl,--wrap=msc_mgcp_call_assignment \ -Wl,--wrap=a_iface_tx_cipher_mode \ -Wl,--wrap=ranap_iu_tx_sec_mode_cmd \ + -Wl,--wrap=osmo_sccp_tx_data_msg \ $(NULL) LDADD = \ diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index add9f7f..4254066 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -1053,8 +1053,11 @@ comment_end(); } -static void test_a5_3_not_supported() +static void test_a5_3_supported() { + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + comment_start(); /* implicit: net->authentication_required = true; */ @@ -1093,12 +1096,403 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); BTW("MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS" - " -- alas, no matching cipher can be found, abort and release"); + " -- but needs Classmark 2 to determine whether A5/3 is supported"); cipher_mode_cmd_sent = false; - expect_bssap_clear(); ms_sends_msg("05542d8b2c3e"); OSMO_ASSERT(!cipher_mode_cmd_sent); - VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3"); + expect_cipher_mode_cmd("61855fb81fc2a800"); + bss_sends_bssap_mgmt("541203505886130b6014042f6503b8800d2100"); + OSMO_ASSERT(cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000004026f0"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804032443f2", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT"); + expect_bssap_clear(); + gsup_rx("06010809710000004026f0", NULL); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("LU was successful, and the conn has already been closed"); + VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector"); + cm_service_result_sent = RES_NONE; + auth_request_sent = false; + auth_request_expect_rand = "12aca96fb4ffdea5c985cbafa9b6e18b"; + ms_sends_msg("05247803305886089910070000006402"); + OSMO_ASSERT(g_conn); + OSMO_ASSERT(g_conn->fi); + OSMO_ASSERT(g_conn->vsub); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + btw("needs auth, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3," + " so no need to request Classmark Update."); + expect_cipher_mode_cmd("07fa7502e07e1c00"); + ms_sends_msg("0554" "20bde240" /* 2nd vector's sres, s.a. */); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d"); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + /* Release connection */ + expect_bssap_clear(RAN_GERAN_A); + conn_conclude_cm_service_req(g_conn, RAN_GERAN_A); + + btw("all requests serviced, conn has been released"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("an SMS is sent, MS is paged"); + paging_expect_imsi(imsi); + paging_sent = false; + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + + send_sms(vsub, vsub, + "Privacy in residential applications is a desirable" + " marketing option."); + + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + vsub = NULL; + VERBOSE_ASSERT(paging_sent, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == false, "%d"); + + btw("the subscriber and its pending request should remain"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + + btw("MS replies with Paging Response, and VLR sends Auth Request with third key"); + auth_request_sent = false; + auth_request_expect_rand = "e7c03ba7cf0e2fde82b2dc4d63077d42"; + ms_sends_msg("06270703305882089910070000006402"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + btw("needs auth, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Authen Response, VLR accepts and requests Ciphering"); + expect_cipher_mode_cmd("e2b234f807886400"); + ms_sends_msg("0554" "a29514ae" /* 3rd vector's sres, s.a. */); + VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d"); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS"); + dtap_expect_tx("09" /* SMS messages */ + "01" /* CP-DATA */ + "58" /* length */ + "01" /* Network to MS */ + "00" /* reference */ + /* originator (gsm411_send_sms() hardcodes this weird nr) */ + "0791" "447758100650" /* 447785016005 */ + "00" /* dest */ + /* SMS TPDU */ + "4c" /* len */ + "00" /* SMS deliver */ + "05802443f2" /* originating address 42342 */ + "00" /* TP-PID */ + "00" /* GSM default alphabet */ + "071010" /* Y-M-D (from wrapped gsm340_gen_scts())*/ + "000000" /* H-M-S */ + "00" /* GMT+0 */ + "44" /* data length */ + "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e" + "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" + "0c7ac3e9e9b7db05"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == true, "%d"); + + btw("SMS was delivered, no requests pending for subscr"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + vlr_subscr_put(vsub); + + btw("conn is still open to wait for SMS ack dance"); + EXPECT_CONN_COUNT(1); + + btw("MS replies with CP-ACK for received SMS"); + ms_sends_msg("8904"); + EXPECT_CONN_COUNT(1); + + btw("MS also sends RP-ACK, MSC in turn sends CP-ACK for that"); + dtap_expect_tx("0904"); + expect_bssap_clear(); + ms_sends_msg("890106020041020000"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("SMS is done, conn is gone"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("subscriber detaches"); + expect_bssap_clear(); + ms_sends_msg("050130089910070000006402"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + clear_vlr(); + comment_end(); +} + +/* During CM Service Request or Paging Response we already have Classmark 2 that indicates A5/3 + * availablity. Here, in a hacky way remove the knowledge of Classmark 2 to tickle a code path where + * proc_arq_fsm needs a Classmark Update during Ciphering. Shouldn't happen in reality though. */ +static void test_cm_service_needs_classmark_update() +{ + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + + comment_start(); + + /* A5/3 support is indicated in Classmark 3. By configuring A5/3, trigger the code paths that + * send a Classmark Request. */ + net->a5_encryption_mask = (1 << 3); /* A5/3 */ + /* implicit: net->authentication_required = true; */ + + btw("Location Update request causes a GSUP Send Auth Info request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("08010809710000004026f0"); + ms_sends_msg("050802008168000130089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS"); + /* Based on a Ki of 000102030405060708090a0b0c0d0e0f */ + auth_request_sent = false; + auth_request_expect_rand = "585df1ae287f6e273dce07090d61320b"; + auth_request_expect_autn = NULL; + gsup_rx("0a" + /* imsi */ + "0108" "09710000004026f0" + /* 5 auth vectors... */ + /* TL TL rand */ + "0322" "2010" "585df1ae287f6e273dce07090d61320b" + /* TL sres TL kc */ + "2104" "2d8b2c3e" "2208" "61855fb81fc2a800" + "0322" "2010" "12aca96fb4ffdea5c985cbafa9b6e18b" + "2104" "20bde240" "2208" "07fa7502e07e1c00" + "0322" "2010" "e7c03ba7cf0e2fde82b2dc4d63077d42" + "2104" "a29514ae" "2208" "e2b234f807886400" + "0322" "2010" "fa8f20b781b5881329d4fea26b1a3c51" + "2104" "5afc8d72" "2208" "2392f14f709ae000" + "0322" "2010" "0fd4cc8dbe8715d1f439e304edfd68dc" + "2104" "bc8d1c5b" "2208" "da7cdd6bfe2d7000", + NULL); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + BTW("MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS" + " -- but needs Classmark 2 to determine whether A5/3 is supported"); + cipher_mode_cmd_sent = false; + ms_sends_msg("05542d8b2c3e"); + OSMO_ASSERT(!cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3"); + expect_cipher_mode_cmd("61855fb81fc2a800"); + bss_sends_bssap_mgmt("541203505886130b6014042f6503b8800d2100"); + OSMO_ASSERT(cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000004026f0"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804032443f2", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT"); + expect_bssap_clear(); + gsup_rx("06010809710000004026f0", NULL); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("LU was successful, and the conn has already been closed"); + VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + + BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector"); + cm_service_result_sent = RES_NONE; + auth_request_sent = false; + auth_request_expect_rand = "12aca96fb4ffdea5c985cbafa9b6e18b"; + ms_sends_msg("05247803305886089910070000006402"); + OSMO_ASSERT(g_conn); + OSMO_ASSERT(g_conn->fi); + OSMO_ASSERT(g_conn->vsub); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + btw("needs auth, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3," + " so no need to request Classmark Update."); + expect_cipher_mode_cmd("07fa7502e07e1c00"); + ms_sends_msg("0554" "20bde240" /* 2nd vector's sres, s.a. */); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d"); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + thwart_rx_non_initial_requests(); + + btw("MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + /* Release connection */ + expect_bssap_clear(RAN_GERAN_A); + conn_conclude_cm_service_req(g_conn, RAN_GERAN_A); + + btw("all requests serviced, conn has been released"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("an SMS is sent, MS is paged"); + paging_expect_imsi(imsi); + paging_sent = false; + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + + send_sms(vsub, vsub, "Privacy in residential applications is a desirable marketing option."); + + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + vsub = NULL; + VERBOSE_ASSERT(paging_sent, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == false, "%d"); + + btw("the subscriber and its pending request should remain"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d"); + vlr_subscr_put(vsub); + + btw("MS replies with Paging Response, and VLR sends Auth Request with third key"); + auth_request_sent = false; + auth_request_expect_rand = "e7c03ba7cf0e2fde82b2dc4d63077d42"; + ms_sends_msg("06270703305882089910070000006402"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + BTW("Fake a situation where Classmark 2 is unknown during proc_arq_fsm"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + vsub->classmark.classmark2_len = 0; + vsub->classmark.classmark3_len = 0; + vlr_subscr_put(vsub); + + + btw("MS sends Authen Response, VLR accepts and requests Ciphering"); + btw("MS sends Authen Response, VLR accepts and requests Ciphering." + " Normally, we'd know Classmark 3, but this test removed it." + " Hence a Classmark Request is generated."); + cipher_mode_cmd_sent = false; + ms_sends_msg("0554" "a29514ae" /* 3rd vector's sres, s.a. */); + OSMO_ASSERT(!cipher_mode_cmd_sent); + + btw("BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3"); + expect_cipher_mode_cmd("e2b234f807886400"); + bss_sends_bssap_mgmt("541203505886130b6014042f6503b8800d2100"); + OSMO_ASSERT(cipher_mode_cmd_sent); + + btw("needs ciph, not yet accepted"); + EXPECT_ACCEPTED(false); + + btw("MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS"); + dtap_expect_tx("09" /* SMS messages */ + "01" /* CP-DATA */ + "58" /* length */ + "01" /* Network to MS */ + "00" /* reference */ + /* originator (gsm411_send_sms() hardcodes this weird nr) */ + "0791" "447758100650" /* 447785016005 */ + "00" /* dest */ + /* SMS TPDU */ + "4c" /* len */ + "00" /* SMS deliver */ + "05802443f2" /* originating address 42342 */ + "00" /* TP-PID */ + "00" /* GSM default alphabet */ + "071010" /* Y-M-D (from wrapped gsm340_gen_scts())*/ + "000000" /* H-M-S */ + "00" /* GMT+0 */ + "44" /* data length */ + "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e" + "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" + "0c7ac3e9e9b7db05"); + ms_sends_msg("0632"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(paging_stopped, == true, "%d"); + + btw("SMS was delivered, no requests pending for subscr"); + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d"); + vlr_subscr_put(vsub); + + btw("conn is still open to wait for SMS ack dance"); + EXPECT_CONN_COUNT(1); + + btw("MS replies with CP-ACK for received SMS"); + ms_sends_msg("8904"); + EXPECT_CONN_COUNT(1); + + btw("MS also sends RP-ACK, MSC in turn sends CP-ACK for that"); + dtap_expect_tx("0904"); + expect_bssap_clear(); + ms_sends_msg("890106020041020000"); + VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + btw("SMS is done, conn is gone"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + BTW("subscriber detaches"); + expect_bssap_clear(); + ms_sends_msg("050130089910070000006402"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); bss_sends_clear_complete(); EXPECT_CONN_COUNT(0); @@ -1114,6 +1508,7 @@ test_ciph_imeisv, test_ciph_tmsi_imei, test_gsm_ciph_in_umts_env, - test_a5_3_not_supported, + test_a5_3_supported, + test_cm_service_needs_classmark_update, NULL }; diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 6a00669..4a13b68 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -2260,7 +2260,7 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 -===== test_a5_3_not_supported +===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST new conn @@ -2309,7 +2309,7 @@ lu_result_sent == 0 auth_request_sent == 1 --- -- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- alas, no matching cipher can be found, abort and release +- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) @@ -2326,23 +2326,98 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode +DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH +DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 +DMSC Looking for A subscriber: conn_id 0 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CLASSMARK_UPDATE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DMM -> CIPHER MODE COMMAND IMSI:901700000004620 -DMSC CLASSMARK 2 unknown, assuming MS doesn't support A5/3 -DMM IMSI:901700000004620: cannot start ciphering, no intersection between MSC-configured and MS-supported A5 algorithms -- ERROR sending ciphering mode command: rc=-95 -DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Failed to send Ciphering Mode Command -- sending LU Reject for IMSI:901700000004620, cause 17 -DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_DONE -DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_CN_CLOSE -DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_RELEASING -DREF IMSI:901700000004620: MSC conn use + release == 2 (0x102: dtap,release) +- sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 61855fb81fc2a800 + lu_result_sent == 0 +- MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR IMSI:901700000004620: CIPHERING MODE COMPLETE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804032443f2 +DVLR GSUP rx 17: 10010809710000004026f00804032443f2 DREF VLR subscr IMSI:901700000004620 usage increases to: 2 -DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR IMSI:901700000004620 has MSISDN:42342 +DVLR SUBSCR(MSISDN:42342) VLR: update for IMSI=901700000004620 (MSISDN=42342, used=2) +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +- sending LU Accept for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 - BSSAP Clear --RAN_GERAN_A--> MS -DREF IMSI:901700000004620: MSC conn use - dtap == 1 (0x100: release) - lu_result_sent == 2 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + bssap_clear_sent == 1 +- LU was successful, and the conn has already been closed + lu_result_sent == 1 - BSS sends BSSMAP Clear Complete -DREF IMSI:901700000004620: MSC conn use - release == 0 (0x0: ) +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -2351,13 +2426,827 @@ DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated -DRLL IMSI:901700000004620: Freeing subscriber connection -DREF VLR subscr IMSI:901700000004620 usage decreases to: 0 -DREF freeing VLR subscr IMSI:901700000004620 +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated llist_count(&net->subscr_conns) == 0 -===== test_a5_3_not_supported: SUCCESS +--- +- after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) +DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=1 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=1 auth_types=0x1 and... +- ...rand=12aca96fb4ffdea5c985cbafa9b6e18b +- ...expecting sres=20bde240 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 + cm_service_result_sent == 0 +- needs auth, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3, so no need to request Classmark Update. + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: 20bde240 (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 07fa7502e07e1c00 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + cm_service_result_sent == 0 + cipher_mode_cmd_sent == 1 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DREF MSISDN:42342: MSC conn use + cm_service == 1 (0x8: cm_service) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +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 + cm_service_result_sent == 0 +- Concluding CM Service Request +DREF MSISDN:42342: MSC conn use - cm_service == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + bssap_clear_sent == 1 +- all requests serviced, conn has been released +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- an SMS is sent, MS is paged +DREF VLR subscr MSISDN:42342 usage increases to: 2 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DMM Subscriber MSISDN:42342 not paged yet, start paging. + RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 + strcmp(paging_expecting_imsi, imsi) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 + paging_sent == 1 + paging_stopped == 0 +- the subscriber and its pending request should remain +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +- MS replies with Paging Response, and VLR sends Auth Request with third key + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) +DRR PAGING RESPONSE: MI(IMSI)=901700000004620 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=2 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... +- ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 +- ...expecting sres=a29514ae +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 +- needs auth, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Authen Response, VLR accepts and requests Ciphering + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: a29514ae (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: e2b234f807886400 +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + cipher_mode_cmd_sent == 1 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DPAG Paging success for MSISDN:42342 (event=0) +DPAG Calling paging cbfn. +DCC (ti 00 sub MSISDN:42342 callref 40000004) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS + dtap_tx_confirmed == 1 + paging_stopped == 1 +- SMS was delivered, no requests pending for subscr +DREF VLR subscr MSISDN:42342 usage increases to: 5 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +- conn is still open to wait for SMS ack dance + llist_count(&net->subscr_conns) == 1 +- MS replies with CP-ACK for received SMS + MSC <--RAN_GERAN_A-- MS: SMS:0x04 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_COMMUNICATING +DREF MSISDN:42342: MSC conn use - dtap == 1 (0x20: trans_sms) + llist_count(&net->subscr_conns) == 1 +- MS also sends RP-ACK, MSC in turn sends CP-ACK for that + MSC <--RAN_GERAN_A-- MS: SMS:0x01 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF MSISDN:42342: MSC conn use - trans_sms == 1 (0x2: dtap) +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + dtap_tx_confirmed == 1 + bssap_clear_sent == 1 +- SMS is done, conn is gone +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- subscriber detaches + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) +DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DMM IMSI DETACH for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 0 +DREF freeing VLR subscr MSISDN:42342 +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING +DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) +- BSSAP Clear --RAN_GERAN_A--> MS +DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF unknown: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DRLL Freeing subscriber connection with NULL subscriber +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +===== test_a5_3_supported: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 12 + +===== test_cm_service_needs_classmark_update +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR GSUP tx: 08010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DVLR GSUP rx 191: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a8000322201012aca96fb4ffdea5c985cbafa9b6e18b210420bde240220807fa7502e07e1c0003222010e7c03ba7cf0e2fde82b2dc4d63077d422104a29514ae2208e2b234f80788640003222010fa8f20b781b5881329d4fea26b1a3c5121045afc8d7222082392f14f709ae000032220100fd4cc8dbe8715d1f439e304edfd68dc2104bc8d1c5b2208da7cdd6bfe2d7000 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI:901700000004620) Received 5 auth tuples +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for IMSI:901700000004620: tuple use_count=1 key_seq=0 auth_types=0x1 and... +- ...rand=585df1ae287f6e273dce07090d61320b +- ...expecting sres=2d8b2c3e +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 + auth_request_sent == 1 +--- +- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM IMSI:901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI:901700000004620) AUTH on GERAN received SRES/RES: 2d8b2c3e (4 bytes) +DVLR SUBSCR(IMSI:901700000004620) AUTH established GSM security context +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode +DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH +DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 +DMSC Looking for A subscriber: conn_id 0 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CLASSMARK_UPDATE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DMM -> CIPHER MODE COMMAND IMSI:901700000004620 +- sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 61855fb81fc2a800 + lu_result_sent == 0 +- MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR IMSI:901700000004620: CIPHERING MODE COMPLETE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804032443f2 +DVLR GSUP rx 17: 10010809710000004026f00804032443f2 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR IMSI:901700000004620 has MSISDN:42342 +DVLR SUBSCR(MSISDN:42342) VLR: update for IMSI=901700000004620 (MSISDN=42342, used=2) +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +- sending LU Accept for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +- BSSAP Clear --RAN_GERAN_A--> MS +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + bssap_clear_sent == 1 +- LU was successful, and the conn has already been closed + lu_result_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24) +DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=1 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=1 auth_types=0x1 and... +- ...rand=12aca96fb4ffdea5c985cbafa9b6e18b +- ...expecting sres=20bde240 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 + cm_service_result_sent == 0 +- needs auth, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3, so no need to request Classmark Update. + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: 20bde240 (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620) +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(CM_SERVICE_REQ:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: 07fa7502e07e1c00 +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + cm_service_result_sent == 0 + cipher_mode_cmd_sent == 1 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:42342: Message not permitted for initial conn: SMS:0x01 +- MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DREF MSISDN:42342: MSC conn use + cm_service == 1 (0x8: cm_service) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +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 + cm_service_result_sent == 0 +- Concluding CM Service Request +DREF MSISDN:42342: MSC conn use - cm_service == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + bssap_clear_sent == 1 +- all requests serviced, conn has been released +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(CM_SERVICE_REQ:901700000004620) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- an SMS is sent, MS is paged +DREF VLR subscr MSISDN:42342 usage increases to: 2 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DMM Subscriber MSISDN:42342 not paged yet, start paging. + RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 + strcmp(paging_expecting_imsi, imsi) == 0 +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 + paging_sent == 1 + paging_stopped == 0 +- the subscriber and its pending request should remain +DREF VLR subscr MSISDN:42342 usage increases to: 4 + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +- MS replies with Paging Response, and VLR sends Auth Request with third key + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27) +DRR PAGING RESPONSE: MI(IMSI)=901700000004620 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=2 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... +- ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 +- ...expecting sres=a29514ae +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + auth_request_sent == 1 +--- +- Fake a situation where Classmark 2 is unknown during proc_arq_fsm +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +- MS sends Authen Response, VLR accepts and requests Ciphering +- MS sends Authen Response, VLR accepts and requests Ciphering. Normally, we'd know Classmark 3, but this test removed it. Hence a Classmark Request is generated. + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF MSISDN:42342: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM MSISDN:42342: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(MSISDN:42342) AUTH on GERAN received SRES/RES: a29514ae (4 bytes) +DVLR SUBSCR(MSISDN:42342) AUTH established GSM security context +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(PAGING_RESP:901700000004620) +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode +DMM MSISDN:42342: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED +- BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3 +DMSC Looking for A subscriber: conn_id 0 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CLASSMARK_UPDATE +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DMM -> CIPHER MODE COMMAND MSISDN:42342 +- sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0 +- ...perm algo: A5/3 +- ...key: e2b234f807886400 +- needs ciph, not yet accepted +msc_subscr_conn_is_accepted() == false +- MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS + MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL +DRR MSISDN:42342: CIPHERING MODE COMPLETE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DPAG Paging success for MSISDN:42342 (event=0) +DPAG Calling paging cbfn. +DCC (ti 00 sub MSISDN:42342 callref 40000005) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) +DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS + dtap_tx_confirmed == 1 + paging_stopped == 1 +- SMS was delivered, no requests pending for subscr +DREF VLR subscr MSISDN:42342 usage increases to: 5 + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 +- conn is still open to wait for SMS ack dance + llist_count(&net->subscr_conns) == 1 +- MS replies with CP-ACK for received SMS + MSC <--RAN_GERAN_A-- MS: SMS:0x04 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_COMMUNICATING +DREF MSISDN:42342: MSC conn use - dtap == 1 (0x20: trans_sms) + llist_count(&net->subscr_conns) == 1 +- MS also sends RP-ACK, MSC in turn sends CP-ACK for that + MSC <--RAN_GERAN_A-- MS: SMS:0x01 +DREF MSISDN:42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms) +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING +DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_GERAN_A +- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904 +- DTAP matches expected message +DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF MSISDN:42342: MSC conn use - trans_sms == 1 (0x2: dtap) +DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_COMMUNICATING}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:42342: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +- BSSAP Clear --RAN_GERAN_A--> MS + dtap_tx_confirmed == 1 + bssap_clear_sent == 1 +- SMS is done, conn is gone +- BSS sends BSSMAP Clear Complete +DREF MSISDN:42342: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(PAGING_RESP:901700000004620) +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Freeing instance +DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_DONE}: Deallocated +DRLL MSISDN:42342: Freeing subscriber connection +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +--- +- subscriber detaches + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) +DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 +DREF VLR subscr MSISDN:42342 usage increases to: 2 +DMM IMSI DETACH for MSISDN:42342 +DREF VLR subscr MSISDN:42342 usage increases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 2 +DREF VLR subscr MSISDN:42342 usage decreases to: 1 +DREF VLR subscr MSISDN:42342 usage decreases to: 0 +DREF freeing VLR subscr MSISDN:42342 +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING +DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) +- BSSAP Clear --RAN_GERAN_A--> MS +DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release) + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF unknown: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DRLL Freeing subscriber connection with NULL subscriber +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn{SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +===== test_cm_service_needs_classmark_update: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index c5ab059..ddb6324 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -292,9 +292,79 @@ comment_end(); } +static void test_classmark_update_timeout() +{ + comment_start(); + + fake_time_start(); + + /* implicit: net->authentication_required = true; */ + net->a5_encryption_mask = (1 << 3); /* A5/3 */ + + btw("Location Update request causes a GSUP Send Auth Info request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("08010809710000004026f0"); + ms_sends_msg("050802008168000130089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS"); + /* Based on a Ki of 000102030405060708090a0b0c0d0e0f */ + auth_request_sent = false; + auth_request_expect_rand = "585df1ae287f6e273dce07090d61320b"; + auth_request_expect_autn = NULL; + gsup_rx("0a" + /* imsi */ + "0108" "09710000004026f0" + /* TL TL rand */ + "0322" "2010" "585df1ae287f6e273dce07090d61320b" + /* TL sres TL kc */ + "2104" "2d8b2c3e" "2208" "61855fb81fc2a800" + , + NULL); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + VERBOSE_ASSERT(auth_request_sent, == true, "%d"); + + BTW("MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS" + " -- but needs Classmark 2 to determine whether A5/3 is supported"); + cipher_mode_cmd_sent = false; + ms_sends_msg("05542d8b2c3e"); + OSMO_ASSERT(!cipher_mode_cmd_sent); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + BTW("But the BSSMAP Classmark Update never arrives"); + btw("At first, we're still waiting"); + fake_time_passes(0, 423); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + fake_time_passes(1, 235); + EXPECT_CONN_COUNT(1); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + expect_bssap_clear(); + fake_time_passes(1, 235); + btw("SUBSCR_CONN_TIMEOUT has passed, conn is gone."); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); + + comment_end(); +} + + msc_vlr_test_func_t msc_vlr_tests[] = { test_ms_timeout_lu_auth_resp, test_ms_timeout_cm_auth_resp, test_ms_timeout_paging, + test_classmark_update_timeout, NULL }; diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index eb40a97..43eb3d4 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -554,6 +554,136 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 +===== test_classmark_update_timeout +- Total time passed: 0.000000 s +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth+Ciph +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR GSUP tx: 08010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a800 +DVLR GSUP rx 47: 0a010809710000004026f003222010585df1ae287f6e273dce07090d61320b21042d8b2c3e220861855fb81fc2a800 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI:901700000004620) Received 1 auth tuples +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use GSM AKA (is_r99=no, at->vec.auth_types=0x1) +- sending GSM Auth Request for IMSI:901700000004620: tuple use_count=1 key_seq=0 auth_types=0x1 and... +- ...rand=585df1ae287f6e273dce07090d61320b +- ...expecting sres=2d8b2c3e +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 + auth_request_sent == 1 +--- +- MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP +DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap) +DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14) +DMM IMSI:901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI:901700000004620) AUTH on GERAN received SRES/RES: 2d8b2c3e (4 bytes) +DVLR SUBSCR(IMSI:901700000004620) AUTH established GSM security context +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Freeing instance +DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode +DMM IMSI:901700000004620: to determine whether A5/3 is supported, first ask for a Classmark Update to obtain Classmark 2 + BSC <--BSSAP-BSS-MANAGEMENT-- MSC: CLASSMARK REQ [L3]> 00 01 58 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH +DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +--- +- But the BSSMAP Classmark Update never arrives +- At first, we're still waiting +- Total time passed: 0.000423 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 1.000658 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 2.000893 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 3.001128 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 4.001363 s + llist_count(&net->subscr_conns) == 1 + lu_result_sent == 0 +- Total time passed: 5.001598 s +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Timeout of T0 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: Close event, cause: CONGESTION +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_WAIT_CLASSMARK_UPDATE}: state_chg to SUBSCR_CONN_S_RELEASING +DREF IMSI:901700000004620: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +- sending LU Reject for IMSI:901700000004620, cause 22 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_CN_CLOSE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Event SUBSCR_CONN_E_CN_CLOSE not permitted +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +- BSSAP Clear --RAN_GERAN_A--> MS +- SUBSCR_CONN_TIMEOUT has passed, conn is gone. + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF IMSI:901700000004620: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated +DRLL IMSI:901700000004620: Freeing subscriber connection +DREF VLR subscr IMSI:901700000004620 usage decreases to: 0 +DREF freeing VLR subscr IMSI:901700000004620 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 + lu_result_sent == 2 +===== test_classmark_update_timeout: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 12 + full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index bf1b200..1192cf2 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -35,6 +35,7 @@ #include #include #include +#include #if BUILD_IU #include @@ -111,10 +112,10 @@ struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex) { - struct msgb *msg = msgb_alloc(size, label); + struct msgb *msg = msgb_alloc_headroom(size, 4, label); unsigned char *rc; - msg->l2h = msg->head; - rc = msgb_put(msg, osmo_hexparse(hex, msg->head, msgb_tailroom(msg))); + msg->l2h = msg->data; + rc = msgb_put(msg, osmo_hexparse(hex, msg->data, msgb_tailroom(msg))); OSMO_ASSERT(rc == msg->l2h); return msg; } @@ -240,7 +241,32 @@ msg = msgb_from_hex("ms_sends_msg", 1024, hex); msg->l1h = msg->l2h = msg->l3h = msg->data; rx_from_ms(msg); - talloc_free(msg); + msgb_free(msg); +} + +void bss_sends_bssap_mgmt(const char *hex) +{ + struct msgb *msg; + struct bssmap_header *bh; + struct a_conn_info a_conn_info; + + msg = msgb_from_hex("bss_sends_bssap_mgmt", 1024, hex); + msg->l3h = msg->data; + + msg->l2h = msgb_push(msg, sizeof(*bh)); + bh = (void*)msg->l2h; + bh->type = BSSAP_MSG_BSS_MANAGEMENT; + bh->length = msgb_l3len(msg); + + if (g_conn && !conn_exists(g_conn)) + g_conn = NULL; + + OSMO_ASSERT(g_conn); + a_conn_info.network = net; + a_conn_info.conn_id = g_conn->a.conn_id; + + a_sccp_rx_dt((struct osmo_sccp_user*)0x1, &a_conn_info, msg); + msgb_free(msg); } static int ms_sends_msg_fake(uint8_t pdisc, uint8_t msg_type) @@ -363,6 +389,33 @@ paging_stopped = true; } + +/* override, requires '-Wl,--wrap=osmo_sccp_tx_data_msg' */ +int __real_osmo_sccp_tx_data_msg(struct osmo_sccp_user *scu, uint32_t conn_id, + struct msgb *msg); +int __wrap_osmo_sccp_tx_data_msg(struct osmo_sccp_user *scu, uint32_t conn_id, + struct msgb *msg) +{ + const char *proto_str; + const char *msg_str = gsm0808_bssmap_name(msg->l3h[2]); + switch (*msg->l3h) { + case BSSAP_MSG_BSS_MANAGEMENT: + proto_str = "BSSAP-BSS-MANAGEMENT"; + break; + case BSSAP_MSG_DTAP: + proto_str = "BSSAP-DTAP"; + break; + default: + proto_str = ""; + msg_str = ""; + break; + } + + log("BSC <--%s-- MSC: %s %s", proto_str, msg_str, msgb_hexdump(msg)); + msgb_free(msg); + return 0; +} + void clear_vlr() { struct vlr_subscr *vsub, *n; diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 4ca05d2..cc200bd 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -161,6 +161,7 @@ void paging_expect_imsi(const char *imsi); void paging_expect_tmsi(uint32_t tmsi); +void bss_sends_bssap_mgmt(const char *hex); void ms_sends_msg(const char *hex); void ms_sends_security_mode_complete(); void gsup_rx(const char *rx_hex, const char *expect_tx_hex); -- To view, visit https://gerrit.osmocom.org/10987 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: I73c7cb6a86624695bd9c0f59abb72e2fdc655131 Gerrit-Change-Number: 10987 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 10:36:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 10:36:15 +0000 Subject: Change in libosmocore[master]: logging: Fix logging level all In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10116 ) Change subject: logging: Fix logging level all ...................................................................... Abandoned Abandoning, other patchset have been merged to address the issue. -- To view, visit https://gerrit.osmocom.org/10116 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: I0f50ad8d6fd038398f7d751287417505c8dcdeff Gerrit-Change-Number: 10116 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr 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 Mon Sep 17 10:36:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:36:20 +0000 Subject: Change in osmo-sgsn[master]: sgsn: use gtp_clear_queues() when reset sgsn state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10988 ) Change subject: sgsn: use gtp_clear_queues() when reset sgsn state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10988 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: I49d70cb7abe5cbe92ea68882fa68eccec0e79586 Gerrit-Change-Number: 10988 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 10:36: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 Sep 17 10:36:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 10:36:21 +0000 Subject: Change in osmo-sgsn[master]: sgsn: use gtp_clear_queues() when reset sgsn state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10988 ) Change subject: sgsn: use gtp_clear_queues() when reset sgsn state ...................................................................... sgsn: use gtp_clear_queues() when reset sgsn state Allow ttcn3 to flush the gtp queue between each test. Fixes ttcn3 test SGSN_Tests.TC_attach_pdp_act_deact_mt_t3395_expire Change-Id: I49d70cb7abe5cbe92ea68882fa68eccec0e79586 --- M src/gprs/sgsn_vty.c 1 file changed, 3 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 057be9f..154e576 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -823,6 +823,9 @@ bssgp_flush_all_queues(); vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE); + gtp_clear_queues(sgsn->gsn); + vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE); + /* remove all queues to bssgp */ return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10988 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: I49d70cb7abe5cbe92ea68882fa68eccec0e79586 Gerrit-Change-Number: 10988 Gerrit-PatchSet: 1 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 Sep 17 10:36:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 10:36:23 +0000 Subject: Change in libosmocore[master]: logging: Add VTY cmd: logging level default In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10136 ) Change subject: logging: Add VTY cmd: logging level default ...................................................................... Abandoned Abandoning, other patchset have been merged to address the issue. -- To view, visit https://gerrit.osmocom.org/10136 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: Iee0d4da16b075e798f85c3f6adeb513057fd5402 Gerrit-Change-Number: 10136 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 10:41:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 10:41:57 +0000 Subject: Change in osmo-mgw[master]: mgcp: Fix osmux_cid_bitmap static array size calculation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10995 Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... mgcp: Fix osmux_cid_bitmap static array size calculation Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is 256 which fits array boundaries correctly (multiple of 8). However, if for example OSMUC_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd have an undesired memory access when accessing last 4 CIDs. Change-Id: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/10995/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 26817c8..f9ab839 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -656,7 +656,7 @@ } /*! bsc-nat allocates/releases the OSMUX cids (Circuit IDs). */ -static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8]; +static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8]; /*! count the number of taken OSMUX cids. * \returns number of OSMUX cids in use */ -- To view, visit https://gerrit.osmocom.org/10995 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: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c Gerrit-Change-Number: 10995 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Sep 17 10:44:03 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:44:03 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b9f858056207_4c4de8c68c8763d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 125s] No package 'libpcsclite' found [ 125s] simtrace2-remsim.o: In function `main': [ 125s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 125s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 125s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 125s] apdu_dispatch.o: In function `apdu_segment_in': [ 125s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 125s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 125s] collect2: error: ld returned 1 exit status [ 125s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 125s] make[2]: *** [simtrace2-remsim] Error 1 [ 125s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 125s] Makefile:20: recipe for target 'utils' failed [ 125s] make[1]: *** [utils] Error 2 [ 125s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 125s] dh_auto_build: make -j1 returned exit code 2 [ 125s] debian/rules:4: recipe for target 'build' failed [ 125s] make: *** [build] Error 2 [ 125s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 125s] [ 125s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:43:54 UTC 2018. [ 125s] [ 125s] ### VM INTERACTION START ### [ 128s] [ 120.755380] sysrq: SysRq : Power Off [ 128s] [ 120.761779] reboot: Power down [ 128s] ### VM INTERACTION END ### [ 128s] [ 128s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:43:57 UTC 2018. [ 128s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:43:46 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:43:46 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b9f8580558c_4c4de8c68c87629a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 119s] No package 'libpcsclite' found [ 119s] simtrace2-remsim.o: In function `main': [ 119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 119s] apdu_dispatch.o: In function `apdu_segment_in': [ 119s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 119s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 119s] collect2: error: ld returned 1 exit status [ 119s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 119s] make[2]: *** [simtrace2-remsim] Error 1 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 119s] Makefile:20: recipe for target 'utils' failed [ 119s] make[1]: *** [utils] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 119s] dh_auto_build: make -j1 returned exit code 2 [ 119s] debian/rules:4: recipe for target 'build' failed [ 119s] make: *** [build] Error 2 [ 119s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 119s] [ 119s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:43:36 UTC 2018. [ 119s] [ 119s] ### VM INTERACTION START ### [ 122s] [ 114.797117] sysrq: SysRq : Power Off [ 122s] [ 114.803155] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:43:39 UTC 2018. [ 122s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:44:03 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:44:03 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b9f858162ff_4c4de8c68c87649a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:43:42 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 140s] [ 129.557005] sysrq: SysRq : Power Off [ 140s] [ 129.561500] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:43:47 UTC 2018. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:44:37 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:44:37 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b9f859b95652_4c4de8c68c876561@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 133s] No package 'libpcsclite' found [ 133s] simtrace2-remsim.o: In function `main': [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 133s] apdu_dispatch.o: In function `apdu_segment_in': [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 133s] collect2: error: ld returned 1 exit status [ 133s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 133s] make[2]: *** [simtrace2-remsim] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 133s] Makefile:20: recipe for target 'utils' failed [ 133s] make[1]: *** [utils] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] dh_auto_build: make -j1 returned exit code 2 [ 133s] debian/rules:4: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] lamb74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:44:17 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 137s] [ 127.138446] sysrq: SysRq : Power Off [ 137s] [ 127.145766] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:44:21 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:44:37 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:44:37 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b9f859c2b1ca_4c4de8c68c876677@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 133s] No package 'libpcsclite' found [ 134s] simtrace2-remsim.o: In function `main': [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 134s] apdu_dispatch.o: In function `apdu_segment_in': [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 134s] collect2: error: ld returned 1 exit status [ 134s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 134s] make[2]: *** [simtrace2-remsim] Error 1 [ 134s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 134s] Makefile:20: recipe for target 'utils' failed [ 134s] make[1]: *** [utils] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] dh_auto_build: make -j1 returned exit code 2 [ 134s] debian/rules:4: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] lamb52 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:44:23 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 126.645895] sysrq: SysRq : Power Off [ 137s] [ 126.652491] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb52 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:44:27 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:45:46 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:45:46 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b9f85f4f3a1f_4c4de8c68c876833@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 108s] No package 'libpcsclite' found [ 108s] simtrace2-remsim.o: In function `main': [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 108s] apdu_dispatch.o: In function `apdu_segment_in': [ 108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 108s] collect2: error: ld returned 1 exit status [ 108s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 108s] make[2]: *** [simtrace2-remsim] Error 1 [ 108s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 108s] Makefile:20: recipe for target 'utils' failed [ 108s] make[1]: *** [utils] Error 2 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 108s] dh_auto_build: make -j1 returned exit code 2 [ 108s] debian/rules:4: recipe for target 'build' failed [ 108s] make: *** [build] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 108s] [ 108s] build71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:45:37 UTC 2018. [ 108s] [ 108s] ### VM INTERACTION START ### [ 111s] [ 104.035080] sysrq: SysRq : Power Off [ 111s] [ 104.037576] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] build71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:45:40 UTC 2018. [ 111s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:46:03 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:46:03 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b9f85f6a0673_4c4de8c68c8769a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 133s] No package 'libpcsclite' found [ 133s] simtrace2-remsim.o: In function `main': [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 133s] apdu_dispatch.o: In function `apdu_segment_in': [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 133s] collect2: error: ld returned 1 exit status [ 133s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 133s] make[2]: *** [simtrace2-remsim] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 133s] Makefile:20: recipe for target 'utils' failed [ 133s] make[1]: *** [utils] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] dh_auto_build: make -j1 returned exit code 2 [ 133s] debian/rules:4: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] lamb06 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:45:52 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 125.099929] sysrq: SysRq : Power Off [ 136s] [ 125.106297] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb06 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:45:56 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 10:47:46 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 10:47:46 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b9f866d39513_4c4de8c68c87724c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 228s] No package 'libpcsclite' found [ 228s] simtrace2-remsim.o: In function `main': [ 228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 228s] apdu_dispatch.o: In function `apdu_segment_in': [ 228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 228s] collect2: error: ld returned 1 exit status [ 228s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 228s] make[2]: *** [simtrace2-remsim] Error 1 [ 228s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 228s] Makefile:20: recipe for target 'utils' failed [ 228s] make[1]: *** [utils] Error 2 [ 228s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 228s] dh_auto_build: make -j1 returned exit code 2 [ 228s] debian/rules:4: recipe for target 'build' failed [ 228s] make: *** [build] Error 2 [ 228s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 228s] [ 228s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:47:23 UTC 2018. [ 228s] [ 228s] ### VM INTERACTION START ### [ 231s] [ 207.387653] sysrq: SysRq : Power Off [ 231s] [ 207.394021] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 10:47:28 UTC 2018. [ 232s] -- 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 Sep 17 10:57:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 10:57:51 +0000 Subject: Change in osmo-gsm-tester[master]: Sanitize existing suite names In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10931 ) Change subject: Sanitize existing suite names ...................................................................... Sanitize existing suite names When first suites were added, osmo-nitb was used. Then new tests using regular split components were added with "aoip_" prefix. At some point it was clear that osmo-nitb was being deprecated so new tests for split components were added without any prefix, as they are expected to be the default one. Since most current and future development is going to be done for split components, as well as new tests added, it makes sense to move the few old testsuites using osmo-nitb to have all "nitb_" prefix, while keeping the split component tests without prefix as it's the regular network topology. Change-Id: Idea2e053d337548e0e9b1b47441dbb262124f909 --- M example/default-suites.conf D suites/aoip_sms/mo_mt_sms.py D suites/aoip_sms/suite.conf M suites/debug/interactive.py M suites/debug/suite.conf R suites/encryption/register_a5_0_authopt.py R suites/encryption/register_a5_0_authreq.py R suites/encryption/register_a5_1_authreq.py R suites/encryption/suite.conf R suites/nitb_debug/error.py R suites/nitb_debug/fail.py R suites/nitb_debug/fail_raise.py R suites/nitb_debug/interactive.py R suites/nitb_debug/pass.py R suites/nitb_debug/suite.conf R suites/nitb_netreg/register.py R suites/nitb_netreg/register_default.py R suites/nitb_netreg/suite.conf R suites/nitb_smpp/esme_connect_policy_acceptall.py R suites/nitb_smpp/esme_connect_policy_closed.py R suites/nitb_smpp/esme_ms_sms_storeforward.py R suites/nitb_smpp/esme_ms_sms_transaction.py C suites/nitb_smpp/suite.conf A suites/nitb_sms/mo_mt_sms.py R suites/nitb_sms/suite.conf R suites/nitb_ussd/assert_extension.py R suites/nitb_ussd/suite.conf M suites/smpp/esme_connect_policy_acceptall.py M suites/smpp/esme_connect_policy_closed.py M suites/smpp/esme_ms_sms_storeforward.py M suites/smpp/esme_ms_sms_transaction.py M suites/smpp/suite.conf M suites/sms/mo_mt_sms.py M suites/sms/suite.conf M suites/ussd/assert_extension.py M suites/ussd/suite.conf 36 files changed, 287 insertions(+), 299 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 6b6e1d0..af7e8de 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -1,7 +1,7 @@ +- nitb_sms:sysmo - sms:sysmo -- aoip_sms:sysmo +- nitb_ussd:sysmo - ussd:sysmo -- aoip_ussd:sysmo - 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 @@ -12,10 +12,10 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo +- nitb_sms:trx-b200 - sms:trx-b200 -- aoip_sms:trx-b200 +- nitb_ussd:trx-b200 - ussd:trx-b200 -- aoip_ussd:trx-b200 - 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 @@ -26,10 +26,10 @@ - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 -- aoip_sms:trx-sysmocell5000 +- nitb_ussd:trx-sysmocell5000 - ussd:trx-sysmocell5000 -- aoip_ussd:trx-sysmocell5000 - 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 @@ -40,10 +40,10 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- sms:nanobts -- aoip_sms:nanobts+band-1900 +- nitb_sms:nanobts +- sms:nanobts+band-1900 +- nitb_ussd:nanobts+band-1900 - ussd:nanobts+band-1900 -- aoip_ussd:nanobts+band-1900 - 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 @@ -52,9 +52,9 @@ - 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 +- sms:nanobts+band-900 +- nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 -- aoip_ussd:nanobts+band-900 - 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 @@ -65,6 +65,6 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- nitb_smpp - smpp -- aoip_smpp -- aoip_encryption +- encryption diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py deleted file mode 100755 index 7654ea6..0000000 --- a/suites/aoip_sms/mo_mt_sms.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/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) - -sms = ms_mo.sms_send(ms_mt) -wait(ms_mt.sms_was_received, sms) diff --git a/suites/aoip_sms/suite.conf b/suites/aoip_sms/suite.conf deleted file mode 100644 index 28a81ea..0000000 --- a/suites/aoip_sms/suite.conf +++ /dev/null @@ -1,9 +0,0 @@ -resources: - ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 - bts: - - times: 1 - modem: - - times: 2 - features: - - sms diff --git a/suites/debug/interactive.py b/suites/debug/interactive.py index 595cfd9..98bf174 100755 --- a/suites/debug/interactive.py +++ b/suites/debug/interactive.py @@ -1,23 +1,43 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * - -print('use resources...') -nitb = suite.nitb() +hlr = suite.hlr() bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) + modems = suite.modems(int(prompt('How many modems?'))) -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.start() +bsc.bts_add(bts) +sgsn.bts_add(bts) + +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + bts.start() -wait(nitb.bts_is_connected, bts) +print('Waiting for bts to connect to bsc...') +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() for m in modems: - nitb.subscriber_add(m) - m.connect(nitb.mcc_mnc()) + hlr.subscriber_add(m) + m.connect(msc.mcc_mnc()) while True: - cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd ') + cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd , data-attach, data-wait, data-detach, data-activate') cmd = cmd.strip().lower() if not cmd: @@ -31,15 +51,15 @@ elif 'wait-registered'.startswith(cmd): try: for m in modems: - wait(m.is_connected, nitb.mcc_mnc()) - wait(nitb.subscriber_attached, *modems) + wait(m.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, *modems) except Timeout: print('Timeout while waiting for registration.') elif 'get-registered'.startswith(cmd): - print(nitb.imsi_list_attached()) + print(msc.imsi_list_attached()) print('RESULT: %s' % - ('All modems are registered.' if nitb.subscriber_attached(*modems) + ('All modems are registered.' if msc.subscriber_attached(*modems) else 'Some modem(s) not registered yet.')) elif 'sms'.startswith(cmd): @@ -107,5 +127,34 @@ response = ms.ussd_send(ussd_cmd) print('modem %s: response=%r' % (ms.name(), response)) + elif cmd.startswith('data-attach'): + if len(params) != 1: + print('wrong format') + continue + for ms in modems: + print('modem %s: attach' % ms.name()) + ms.attach() + wait(ms.is_attached) + print('modem %s: attached' % ms.name()) + + elif cmd.startswith('data-detach'): + if len(params) != 1: + print('wrong format') + continue + for ms in modems: + print('modem %s: detach' % ms.name()) + ms.attach() + wait(lambda: not ms.is_attached()) + print('modem %s: detached' % ms.name()) + + elif cmd.startswith('data-activate'): + if len(params) != 1: + print('wrong format') + continue + for ms in modems: + print('modem %s: activate' % ms.name()) + response = ms.activate_context() + print('modem %s: response=%r' % (ms.name(), response)) + else: print('Unknown command: %s' % cmd) diff --git a/suites/debug/suite.conf b/suites/debug/suite.conf index adfc161..2f36e1d 100644 --- a/suites/debug/suite.conf +++ b/suites/debug/suite.conf @@ -1,10 +1,7 @@ resources: ip_address: - - times: 1 + - times: 8 bts: - times: 1 modem: - times: 4 - -defaults: - timeout: 60s diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/encryption/register_a5_0_authopt.py similarity index 100% rename from suites/aoip_encryption/register_a5_0_authopt.py rename to suites/encryption/register_a5_0_authopt.py diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/encryption/register_a5_0_authreq.py similarity index 100% rename from suites/aoip_encryption/register_a5_0_authreq.py rename to suites/encryption/register_a5_0_authreq.py diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/encryption/register_a5_1_authreq.py similarity index 100% rename from suites/aoip_encryption/register_a5_1_authreq.py rename to suites/encryption/register_a5_1_authreq.py diff --git a/suites/aoip_encryption/suite.conf b/suites/encryption/suite.conf similarity index 100% rename from suites/aoip_encryption/suite.conf rename to suites/encryption/suite.conf diff --git a/suites/debug/error.py b/suites/nitb_debug/error.py similarity index 100% rename from suites/debug/error.py rename to suites/nitb_debug/error.py diff --git a/suites/debug/fail.py b/suites/nitb_debug/fail.py similarity index 100% rename from suites/debug/fail.py rename to suites/nitb_debug/fail.py diff --git a/suites/debug/fail_raise.py b/suites/nitb_debug/fail_raise.py similarity index 100% rename from suites/debug/fail_raise.py rename to suites/nitb_debug/fail_raise.py diff --git a/suites/aoip_debug/interactive.py b/suites/nitb_debug/interactive.py similarity index 63% rename from suites/aoip_debug/interactive.py rename to suites/nitb_debug/interactive.py index 98bf174..595cfd9 100755 --- a/suites/aoip_debug/interactive.py +++ b/suites/nitb_debug/interactive.py @@ -1,43 +1,23 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -bts = suite.bts() -pcu = bts.pcu() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -ggsn = suite.ggsn() -sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) +print('use resources...') +nitb = suite.nitb() +bts = suite.bts() modems = suite.modems(int(prompt('How many modems?'))) -bsc.bts_add(bts) -sgsn.bts_add(bts) - -hlr.start() -stp.start() -ggsn.start() -sgsn.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() - +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() bts.start() -print('Waiting for bts to connect to bsc...') -wait(bsc.bts_is_connected, bts) -print('Waiting for bts to be ready...') -wait(bts.ready_for_pcu) -pcu.start() +wait(nitb.bts_is_connected, bts) for m in modems: - hlr.subscriber_add(m) - m.connect(msc.mcc_mnc()) + nitb.subscriber_add(m) + m.connect(nitb.mcc_mnc()) while True: - cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd , data-attach, data-wait, data-detach, data-activate') + cmd = prompt('Enter command: (q)uit (s)ms (g)et-registered (w)ait-registered, call-list [], call-dial , call-wait-incoming , call-answer , call-hangup , ussd ') cmd = cmd.strip().lower() if not cmd: @@ -51,15 +31,15 @@ elif 'wait-registered'.startswith(cmd): try: for m in modems: - wait(m.is_connected, msc.mcc_mnc()) - wait(msc.subscriber_attached, *modems) + wait(m.is_connected, nitb.mcc_mnc()) + wait(nitb.subscriber_attached, *modems) except Timeout: print('Timeout while waiting for registration.') elif 'get-registered'.startswith(cmd): - print(msc.imsi_list_attached()) + print(nitb.imsi_list_attached()) print('RESULT: %s' % - ('All modems are registered.' if msc.subscriber_attached(*modems) + ('All modems are registered.' if nitb.subscriber_attached(*modems) else 'Some modem(s) not registered yet.')) elif 'sms'.startswith(cmd): @@ -127,34 +107,5 @@ response = ms.ussd_send(ussd_cmd) print('modem %s: response=%r' % (ms.name(), response)) - elif cmd.startswith('data-attach'): - if len(params) != 1: - print('wrong format') - continue - for ms in modems: - print('modem %s: attach' % ms.name()) - ms.attach() - wait(ms.is_attached) - print('modem %s: attached' % ms.name()) - - elif cmd.startswith('data-detach'): - if len(params) != 1: - print('wrong format') - continue - for ms in modems: - print('modem %s: detach' % ms.name()) - ms.attach() - wait(lambda: not ms.is_attached()) - print('modem %s: detached' % ms.name()) - - elif cmd.startswith('data-activate'): - if len(params) != 1: - print('wrong format') - continue - for ms in modems: - print('modem %s: activate' % ms.name()) - response = ms.activate_context() - print('modem %s: response=%r' % (ms.name(), response)) - else: print('Unknown command: %s' % cmd) diff --git a/suites/debug/pass.py b/suites/nitb_debug/pass.py similarity index 100% rename from suites/debug/pass.py rename to suites/nitb_debug/pass.py diff --git a/suites/aoip_debug/suite.conf b/suites/nitb_debug/suite.conf similarity index 63% rename from suites/aoip_debug/suite.conf rename to suites/nitb_debug/suite.conf index 2f36e1d..adfc161 100644 --- a/suites/aoip_debug/suite.conf +++ b/suites/nitb_debug/suite.conf @@ -1,7 +1,10 @@ resources: ip_address: - - times: 8 + - times: 1 bts: - times: 1 modem: - times: 4 + +defaults: + timeout: 60s diff --git a/suites/netreg/register.py b/suites/nitb_netreg/register.py similarity index 100% rename from suites/netreg/register.py rename to suites/nitb_netreg/register.py diff --git a/suites/netreg/register_default.py b/suites/nitb_netreg/register_default.py similarity index 100% rename from suites/netreg/register_default.py rename to suites/nitb_netreg/register_default.py diff --git a/suites/netreg/suite.conf b/suites/nitb_netreg/suite.conf similarity index 100% rename from suites/netreg/suite.conf rename to suites/nitb_netreg/suite.conf diff --git a/suites/aoip_smpp/esme_connect_policy_acceptall.py b/suites/nitb_smpp/esme_connect_policy_acceptall.py similarity index 84% rename from suites/aoip_smpp/esme_connect_policy_acceptall.py rename to suites/nitb_smpp/esme_connect_policy_acceptall.py index 168b4f3..904226b 100755 --- a/suites/aoip_smpp/esme_connect_policy_acceptall.py +++ b/suites/nitb_smpp/esme_connect_policy_acceptall.py @@ -6,11 +6,8 @@ from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -mgw_msc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -smsc = msc.smsc +nitb = suite.nitb() +smsc = nitb.smsc esme = suite.esme() # Here we deliberately omit calling smsc.esme_add() to avoid having it included @@ -18,10 +15,7 @@ smsc.set_smsc_policy(smsc.SMSC_POLICY_ACCEPT_ALL) esme.set_smsc(smsc) -stp.start() -hlr.start() -msc.start() -mgw_msc.start() +nitb.start() # Due to accept-all policy, connect() should work even if we didn't previously # configure the esme in the smsc, no matter the system_id / password we use. diff --git a/suites/aoip_smpp/esme_connect_policy_closed.py b/suites/nitb_smpp/esme_connect_policy_closed.py similarity index 89% rename from suites/aoip_smpp/esme_connect_policy_closed.py rename to suites/nitb_smpp/esme_connect_policy_closed.py index 487e5a4..eaabb3d 100755 --- a/suites/aoip_smpp/esme_connect_policy_closed.py +++ b/suites/nitb_smpp/esme_connect_policy_closed.py @@ -11,13 +11,8 @@ SMPP_ESME_RINVPASWD = 0x0000000E SMPP_ESME_RINVSYSID = 0x0000000F -hlr = suite.hlr() -bts = suite.bts() -mgw_msc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -smsc = msc.smsc - +nitb = suite.nitb() +smsc = nitb.smsc esme = suite.esme() esme_no_pwd = suite.esme() esme_no_pwd.set_password('') @@ -26,10 +21,7 @@ smsc.esme_add(esme) smsc.esme_add(esme_no_pwd) -stp.start() -hlr.start() -msc.start() -mgw_msc.start() +nitb.start() log('Test with correct credentials (no password)') esme_no_pwd.connect() diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/nitb_smpp/esme_ms_sms_storeforward.py similarity index 63% rename from suites/aoip_smpp/esme_ms_sms_storeforward.py rename to suites/nitb_smpp/esme_ms_sms_storeforward.py index 681bc29..391a040 100755 --- a/suites/aoip_smpp/esme_ms_sms_storeforward.py +++ b/suites/nitb_smpp/esme_ms_sms_storeforward.py @@ -12,46 +12,34 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -hlr = suite.hlr() +nitb = suite.nitb() 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) -bsc.bts_add(bts) - ms = suite.modem() esme = suite.esme() -msc.smsc.esme_add(esme) -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.smsc.esme_add(esme) +nitb.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(nitb.bts_is_connected, bts) esme.connect() -hlr.subscriber_add(ms) +nitb.subscriber_add(ms) wrong_msisdn = ms.msisdn + esme.msisdn -print('sending sms with wrong msisdn %s, it will be stored but not delivered' % wrong_msisdn) +print('sending sms with wrong msisdn %s, it will fail' % wrong_msisdn) msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest') -# Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR -# esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) -umref_wrong = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) +esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) print('sending sms, it will be stored...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message') umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) print('MS registers and will receive the SMS...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +ms.connect(nitb.mcc_mnc()) +wait(ms.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms) wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) @@ -62,8 +50,4 @@ wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) - -print('Asserting the sms with wrong msisdn was not delivered', umref_wrong) -assert not esme.receipt_was_received(umref_wrong) - esme.disconnect() diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/nitb_smpp/esme_ms_sms_transaction.py similarity index 74% rename from suites/aoip_smpp/esme_ms_sms_transaction.py rename to suites/nitb_smpp/esme_ms_sms_transaction.py index 16b01cc..adc9dae 100755 --- a/suites/aoip_smpp/esme_ms_sms_transaction.py +++ b/suites/nitb_smpp/esme_ms_sms_transaction.py @@ -10,36 +10,26 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -hlr = suite.hlr() +nitb = suite.nitb() 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) -bsc.bts_add(bts) - ms = suite.modem() esme = suite.esme() -msc.smsc.esme_add(esme) -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.smsc.esme_add(esme) +nitb.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(nitb.bts_is_connected, bts) esme.connect() -hlr.subscriber_add(ms) -ms.connect(msc.mcc_mnc()) +nitb.subscriber_add(ms) +ms.connect(nitb.mcc_mnc()) ms.log_info() print('waiting for modem to attach...') -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +wait(ms.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms) print('sending first sms...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message') diff --git a/suites/aoip_smpp/suite.conf b/suites/nitb_smpp/suite.conf similarity index 73% copy from suites/aoip_smpp/suite.conf copy to suites/nitb_smpp/suite.conf index 61e7015..eb5dc01 100644 --- a/suites/aoip_smpp/suite.conf +++ b/suites/nitb_smpp/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 + - times: 1 bts: - times: 1 modem: diff --git a/suites/nitb_sms/mo_mt_sms.py b/suites/nitb_sms/mo_mt_sms.py new file mode 100755 index 0000000..10897ff --- /dev/null +++ b/suites/nitb_sms/mo_mt_sms.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +nitb = suite.nitb() +bts = suite.bts() +ms_mo = suite.modem() +ms_mt = suite.modem() + +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() +bts.start() +wait(nitb.bts_is_connected, bts) + +nitb.subscriber_add(ms_mo) +nitb.subscriber_add(ms_mt) + +ms_mo.connect(nitb.mcc_mnc()) +ms_mt.connect(nitb.mcc_mnc()) + +ms_mo.log_info() +ms_mt.log_info() + +print('waiting for modems to attach...') +wait(ms_mo.is_connected, nitb.mcc_mnc()) +wait(ms_mt.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms_mo, ms_mt) + +sms = ms_mo.sms_send(ms_mt) +wait(ms_mt.sms_was_received, sms) diff --git a/suites/aoip_smpp/suite.conf b/suites/nitb_sms/suite.conf similarity index 73% rename from suites/aoip_smpp/suite.conf rename to suites/nitb_sms/suite.conf index 61e7015..485402b 100644 --- a/suites/aoip_smpp/suite.conf +++ b/suites/nitb_sms/suite.conf @@ -1,10 +1,10 @@ resources: ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 + - times: 1 bts: - times: 1 modem: - - times: 1 + - times: 2 features: - sms diff --git a/suites/aoip_ussd/assert_extension.py b/suites/nitb_ussd/assert_extension.py similarity index 63% rename from suites/aoip_ussd/assert_extension.py rename to suites/nitb_ussd/assert_extension.py index 475de09..8ccab2d 100755 --- a/suites/aoip_ussd/assert_extension.py +++ b/suites/nitb_ussd/assert_extension.py @@ -3,36 +3,24 @@ USSD_COMMAND_GET_EXTENSION = '*#100#' -hlr = suite.hlr() +nitb = suite.nitb() 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 = suite.modem() -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() - -bsc.bts_add(bts) -bsc.start() - +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(nitb.bts_is_connected, bts) -hlr.subscriber_add(ms) +nitb.subscriber_add(ms) -ms.connect(msc.mcc_mnc()) - +ms.connect(nitb.mcc_mnc()) ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +wait(ms.is_connected, nitb.mcc_mnc()) +wait(nitb.subscriber_attached, ms) # ofono (qmi) currently changes state to 'registered' jut after sending # 'Location Update Request', but before receiving 'Location Updating Accept'. @@ -46,5 +34,4 @@ print('Sending ussd code %s' % USSD_COMMAND_GET_EXTENSION) response = ms.ussd_send(USSD_COMMAND_GET_EXTENSION) -log('got ussd response: %r' % repr(response)) -assert response.endswith(' ' + ms.msisdn) +assert ' ' + ms.msisdn + '\r' in response diff --git a/suites/aoip_ussd/suite.conf b/suites/nitb_ussd/suite.conf similarity index 69% rename from suites/aoip_ussd/suite.conf rename to suites/nitb_ussd/suite.conf index 460147a..232a5d8 100644 --- a/suites/aoip_ussd/suite.conf +++ b/suites/nitb_ussd/suite.conf @@ -1,9 +1,12 @@ resources: ip_address: - - times: 6 # msc, bsc, hlr, stp, mgw*2 + - times: 1 bts: - times: 1 modem: - times: 1 features: - ussd + +defaults: + timeout: 60s diff --git a/suites/smpp/esme_connect_policy_acceptall.py b/suites/smpp/esme_connect_policy_acceptall.py index 904226b..168b4f3 100755 --- a/suites/smpp/esme_connect_policy_acceptall.py +++ b/suites/smpp/esme_connect_policy_acceptall.py @@ -6,8 +6,11 @@ from osmo_gsm_tester.testenv import * -nitb = suite.nitb() -smsc = nitb.smsc +hlr = suite.hlr() +mgw_msc = suite.mgw() +stp = suite.stp() +msc = suite.msc(hlr, mgw_msc, stp) +smsc = msc.smsc esme = suite.esme() # Here we deliberately omit calling smsc.esme_add() to avoid having it included @@ -15,7 +18,10 @@ smsc.set_smsc_policy(smsc.SMSC_POLICY_ACCEPT_ALL) esme.set_smsc(smsc) -nitb.start() +stp.start() +hlr.start() +msc.start() +mgw_msc.start() # Due to accept-all policy, connect() should work even if we didn't previously # configure the esme in the smsc, no matter the system_id / password we use. diff --git a/suites/smpp/esme_connect_policy_closed.py b/suites/smpp/esme_connect_policy_closed.py index eaabb3d..487e5a4 100755 --- a/suites/smpp/esme_connect_policy_closed.py +++ b/suites/smpp/esme_connect_policy_closed.py @@ -11,8 +11,13 @@ SMPP_ESME_RINVPASWD = 0x0000000E SMPP_ESME_RINVSYSID = 0x0000000F -nitb = suite.nitb() -smsc = nitb.smsc +hlr = suite.hlr() +bts = suite.bts() +mgw_msc = suite.mgw() +stp = suite.stp() +msc = suite.msc(hlr, mgw_msc, stp) +smsc = msc.smsc + esme = suite.esme() esme_no_pwd = suite.esme() esme_no_pwd.set_password('') @@ -21,7 +26,10 @@ smsc.esme_add(esme) smsc.esme_add(esme_no_pwd) -nitb.start() +stp.start() +hlr.start() +msc.start() +mgw_msc.start() log('Test with correct credentials (no password)') esme_no_pwd.connect() diff --git a/suites/smpp/esme_ms_sms_storeforward.py b/suites/smpp/esme_ms_sms_storeforward.py index 391a040..681bc29 100755 --- a/suites/smpp/esme_ms_sms_storeforward.py +++ b/suites/smpp/esme_ms_sms_storeforward.py @@ -12,34 +12,46 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -nitb = suite.nitb() +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) +bsc.bts_add(bts) + ms = suite.modem() esme = suite.esme() +msc.smsc.esme_add(esme) -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.smsc.esme_add(esme) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) esme.connect() -nitb.subscriber_add(ms) +hlr.subscriber_add(ms) wrong_msisdn = ms.msisdn + esme.msisdn -print('sending sms with wrong msisdn %s, it will fail' % wrong_msisdn) +print('sending sms with wrong msisdn %s, it will be stored but not delivered' % wrong_msisdn) msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest') -esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) +# Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR +# esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD) +umref_wrong = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) print('sending sms, it will be stored...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message') umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True) print('MS registers and will receive the SMS...') -ms.connect(nitb.mcc_mnc()) -wait(ms.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms) +ms.connect(msc.mcc_mnc()) +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) @@ -50,4 +62,8 @@ wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) wait(esme.receipt_was_received, umref) + +print('Asserting the sms with wrong msisdn was not delivered', umref_wrong) +assert not esme.receipt_was_received(umref_wrong) + esme.disconnect() diff --git a/suites/smpp/esme_ms_sms_transaction.py b/suites/smpp/esme_ms_sms_transaction.py index adc9dae..16b01cc 100755 --- a/suites/smpp/esme_ms_sms_transaction.py +++ b/suites/smpp/esme_ms_sms_transaction.py @@ -10,26 +10,36 @@ SMPP_ESME_RINVDSTADR = 0x0000000B -nitb = suite.nitb() +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) +bsc.bts_add(bts) + ms = suite.modem() esme = suite.esme() +msc.smsc.esme_add(esme) -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.smsc.esme_add(esme) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) esme.connect() -nitb.subscriber_add(ms) -ms.connect(nitb.mcc_mnc()) +hlr.subscriber_add(ms) +ms.connect(msc.mcc_mnc()) ms.log_info() print('waiting for modem to attach...') -wait(ms.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms) +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) print('sending first sms...') msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message') diff --git a/suites/smpp/suite.conf b/suites/smpp/suite.conf index eb5dc01..61e7015 100644 --- a/suites/smpp/suite.conf +++ b/suites/smpp/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 1 + - times: 6 # msc, bsc, hlr, stp, mgw*2 bts: - times: 1 modem: diff --git a/suites/sms/mo_mt_sms.py b/suites/sms/mo_mt_sms.py index 10897ff..7654ea6 100755 --- a/suites/sms/mo_mt_sms.py +++ b/suites/sms/mo_mt_sms.py @@ -1,30 +1,41 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -nitb = suite.nitb() +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() -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() + +bsc.bts_add(bts) +bsc.start() + bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) -nitb.subscriber_add(ms_mo) -nitb.subscriber_add(ms_mt) +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) -ms_mo.connect(nitb.mcc_mnc()) -ms_mt.connect(nitb.mcc_mnc()) +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, nitb.mcc_mnc()) -wait(ms_mt.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms_mo, ms_mt) +wait(ms_mo.is_connected, msc.mcc_mnc()) +wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms_mo, ms_mt) sms = ms_mo.sms_send(ms_mt) wait(ms_mt.sms_was_received, sms) diff --git a/suites/sms/suite.conf b/suites/sms/suite.conf index 485402b..28a81ea 100644 --- a/suites/sms/suite.conf +++ b/suites/sms/suite.conf @@ -1,12 +1,9 @@ resources: ip_address: - - times: 1 + - times: 6 # msc, bsc, hlr, stp, mgw*2 bts: - times: 1 modem: - times: 2 features: - sms - -defaults: - timeout: 60s diff --git a/suites/ussd/assert_extension.py b/suites/ussd/assert_extension.py index 8ccab2d..475de09 100755 --- a/suites/ussd/assert_extension.py +++ b/suites/ussd/assert_extension.py @@ -3,24 +3,36 @@ USSD_COMMAND_GET_EXTENSION = '*#100#' -nitb = suite.nitb() +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 = suite.modem() -print('start nitb and bts...') -nitb.bts_add(bts) -nitb.start() +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() + +bsc.bts_add(bts) +bsc.start() + bts.start() -wait(nitb.bts_is_connected, bts) +wait(bsc.bts_is_connected, bts) -nitb.subscriber_add(ms) +hlr.subscriber_add(ms) -ms.connect(nitb.mcc_mnc()) +ms.connect(msc.mcc_mnc()) + ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, nitb.mcc_mnc()) -wait(nitb.subscriber_attached, ms) +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) # ofono (qmi) currently changes state to 'registered' jut after sending # 'Location Update Request', but before receiving 'Location Updating Accept'. @@ -34,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) diff --git a/suites/ussd/suite.conf b/suites/ussd/suite.conf index 232a5d8..460147a 100644 --- a/suites/ussd/suite.conf +++ b/suites/ussd/suite.conf @@ -1,12 +1,9 @@ resources: ip_address: - - times: 1 + - times: 6 # msc, bsc, hlr, stp, mgw*2 bts: - times: 1 modem: - times: 1 features: - ussd - -defaults: - timeout: 60s -- To view, visit https://gerrit.osmocom.org/10931 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: Idea2e053d337548e0e9b1b47441dbb262124f909 Gerrit-Change-Number: 10931 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 admin at opensuse.org Mon Sep 17 11:06:21 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 11:06:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b9f8ac25df50_4c4de8c68c8780f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 214s] No package 'libpcsclite' found [ 214s] simtrace2-remsim.o: In function `main': [ 214s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 214s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 214s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 214s] apdu_dispatch.o: In function `apdu_segment_in': [ 214s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 214s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 214s] collect2: error: ld returned 1 exit status [ 214s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 214s] make[2]: *** [simtrace2-remsim] Error 1 [ 214s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 214s] Makefile:20: recipe for target 'utils' failed [ 214s] make[1]: *** [utils] Error 2 [ 214s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 214s] dh_auto_build: make -j1 returned exit code 2 [ 214s] debian/rules:4: recipe for target 'build' failed [ 214s] make: *** [build] Error 2 [ 214s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 214s] [ 214s] armbuild21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 11:06:04 UTC 2018. [ 214s] [ 214s] ### VM INTERACTION START ### [ 217s] [ 206.645401] SysRq : Power Off [ 217s] [ 206.647148] reboot: Power down [ 218s] ### VM INTERACTION END ### [ 218s] [ 218s] armbuild21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 11:06:07 UTC 2018. [ 218s] -- 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 Sep 17 11:26:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 11:26:28 +0000 Subject: Change in openbsc[master]: bsc_filter: Move whitelisted info log to debug Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10996 Change subject: bsc_filter: Move whitelisted info log to debug ...................................................................... bsc_filter: Move whitelisted info log to debug It shows up all the time in logs while using "logging level all info", let's move it to debug. Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b --- M openbsc/src/osmo-bsc_nat/bsc_filter.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/96/10996/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c index ddfcdcb..432529e 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_filter.c +++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c @@ -208,7 +208,7 @@ continue; /* whitelisted */ - LOGP(DNAT, LOGL_INFO, "Whitelisted with rule %d\n", i); + LOGP(DNAT, LOGL_DEBUG, "Whitelisted with rule %d\n", i); return 0; } else { /* whitelisted */ -- To view, visit https://gerrit.osmocom.org/10996 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: I51274dad5afef16e466921c5d58672427d23fd3b Gerrit-Change-Number: 10996 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 Sep 17 11:33:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 11:33:35 +0000 Subject: Change in openbsc[master]: mgcp: Fix (again) osmux_cid_bitmap static array size calculation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10997 Change subject: mgcp: Fix (again) osmux_cid_bitmap static array size calculation ...................................................................... mgcp: Fix (again) osmux_cid_bitmap static array size calculation A previous commit merged today fixed array size boundary (multiple of 8 bits), but removed a required +1 which should be kept on top, because OSMUX_CID_MAX specified the maximum number used by a CID, that is (0,OSMUX_CID_MAX), and as a result we require OSMUX_CID_MAX+1 slots. Fixes: 65f422ad5878165be0a1eb05605aa3099536f0c8 Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/97/10997/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index ca0ed30..a4b7e7a 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -544,8 +544,8 @@ htons(endp->cfg->osmux_port), buf, sizeof(buf)); } -/* bsc-nat allocates/releases the Osmux circuit ID */ -static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8]; +/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */ +static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8]; int osmux_used_cid(void) { -- To view, visit https://gerrit.osmocom.org/10997 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: I182c9c1a6dd28a4c5c0d8107d53852cf47541592 Gerrit-Change-Number: 10997 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 Sep 17 11:39:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 11:39:21 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10998 Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen ...................................................................... mgcp_osmux: Use define to calculate rtp_ssrc_winlen Since that define is already used to allocate size of osmux_cid_bitmap, let's use it here too instead of hardcoding its value. Change-Id: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/98/10998/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 5d16826..f842232 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -515,12 +515,12 @@ * used to reconstruct the RTP flow from osmux. The RTP SSRC is * allocated based on the circuit ID (conn_net->osmux.cid), which is unique * in the local scope to the BSC/BSC-NAT. We use it to divide the RTP - * SSRC space (2^32) by the 256 possible circuit IDs, then randomly + * SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, then randomly * select one value from that window. Thus, we have no chance to have * overlapping RTP SSRC traveling to the BTSes behind the BSC, * similarly, for flows traveling to the MSC. */ - static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256; + static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); uint16_t osmux_dummy = endp->cfg->osmux_dummy; /* Check if osmux is enabled for the specified connection */ -- To view, visit https://gerrit.osmocom.org/10998 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: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb Gerrit-Change-Number: 10998 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 Sep 17 11:40:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 11:40:50 +0000 Subject: Change in openbsc[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10999 Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen ...................................................................... mgcp_osmux: Use define to calculate rtp_ssrc_winlen Since that define is already used to allocate size of osmux_cid_bitmap, let's use it here too instead of hardcoding its value. Change-Id: I768ca1b510bf44508ae064dc31620e739260470b --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/99/10999/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index a4b7e7a..69f1c66 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -434,12 +434,12 @@ * used to reconstruct the RTP flow from osmux. The RTP SSRC is * allocated based on the circuit ID (endp->osmux.cid), which is unique * in the local scope to the BSC/BSC-NAT. We use it to divide the RTP - * SSRC space (2^32) by the 256 possible circuit IDs, then randomly + * SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, then randomly * select one value from that window. Thus, we have no chance to have * overlapping RTP SSRC traveling to the BTSes behind the BSC, * similarly, for flows traveling to the MSC. */ - static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256; + static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); if (endp->osmux.state == OSMUX_STATE_DISABLED) { LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n", -- To view, visit https://gerrit.osmocom.org/10999 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: I768ca1b510bf44508ae064dc31620e739260470b Gerrit-Change-Number: 10999 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 Sep 17 12:28:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:28:22 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3) to the change originally created by dexter. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... gsm_data: remove unused struct member full_rate. Remove unused member gsm_subscriber_connection.user_plane.full_rate. It was forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/10906/3 -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:32:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:32:28 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3) to the change originally created by dexter. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... gsm_data: remove unused struct member chan_mode Remove unused gsm_subscriber_connection.user_plane.chan_mode. There is only one VTY command that displays it along other parameters, but it is used no where else. Lets remove it. It was forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c 2 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/10907/3 -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 3 Gerrit-Owner: dexter 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 Mon Sep 17 12:43:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:43:55 +0000 Subject: Change in osmo-bsc[master]: LCLS: fix codec mismatch detection In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#3) to the change originally created by dexter. ( https://gerrit.osmocom.org/10905 ) Change subject: LCLS: fix codec mismatch detection ...................................................................... LCLS: fix codec mismatch detection gsm_subscriber_connection.user_plane.chan_mode and .full_rate were unused since and forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" Instead of above unused struct members, use lchan->{full_rate,tch_mode}. When not explicitly allowed via VTY settings, the LCLS mechanisms will avoid to locally switch connections with different codecs/rates. For example GSM HR and GSM FR would not be locally switched. Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/10905/3 -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:47:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:47:09 +0000 Subject: Change in osmo-bsc[master]: LCLS: fix codec mismatch detection In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10905 ) Change subject: LCLS: fix codec mismatch detection ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47: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 Sep 17 12:47:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:47:24 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47: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 Sep 17 12:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:47:28 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10907/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10907/1//COMMIT_MSG at 10 PS1, Line 10: There is only one VTY command that displays it along other it would be good to reference the change-id which made it unused/abandoned. -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:47:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:47:46 +0000 Subject: Change in openbsc[master]: bsc_filter: Move whitelisted info log to debug In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10996 ) Change subject: bsc_filter: Move whitelisted info log to debug ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10996 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: I51274dad5afef16e466921c5d58672427d23fd3b Gerrit-Change-Number: 10996 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:48:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:48:10 +0000 Subject: Change in openbsc[master]: mgcp: Fix (again) osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10997 ) Change subject: mgcp: Fix (again) osmux_cid_bitmap static array size calculation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10997 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: I182c9c1a6dd28a4c5c0d8107d53852cf47541592 Gerrit-Change-Number: 10997 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 12:48:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:48:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:48:20 +0000 Subject: Change in openbsc[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10999 ) Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10999 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: I768ca1b510bf44508ae064dc31620e739260470b Gerrit-Change-Number: 10999 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 12: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 Sep 17 12:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:48:22 +0000 Subject: Change in openbsc[master]: bsc_filter: Move whitelisted info log to debug In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10996 ) Change subject: bsc_filter: Move whitelisted info log to debug ...................................................................... bsc_filter: Move whitelisted info log to debug It shows up all the time in logs while using "logging level all info", let's move it to debug. Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b --- M openbsc/src/osmo-bsc_nat/bsc_filter.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c index ddfcdcb..432529e 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_filter.c +++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c @@ -208,7 +208,7 @@ continue; /* whitelisted */ - LOGP(DNAT, LOGL_INFO, "Whitelisted with rule %d\n", i); + LOGP(DNAT, LOGL_DEBUG, "Whitelisted with rule %d\n", i); return 0; } else { /* whitelisted */ -- To view, visit https://gerrit.osmocom.org/10996 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: I51274dad5afef16e466921c5d58672427d23fd3b Gerrit-Change-Number: 10996 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 Sep 17 12:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:48:22 +0000 Subject: Change in openbsc[master]: mgcp: Fix (again) osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10997 ) Change subject: mgcp: Fix (again) osmux_cid_bitmap static array size calculation ...................................................................... mgcp: Fix (again) osmux_cid_bitmap static array size calculation A previous commit merged today fixed array size boundary (multiple of 8 bits), but removed a required +1 which should be kept on top, because OSMUX_CID_MAX specified the maximum number used by a CID, that is (0,OSMUX_CID_MAX), and as a result we require OSMUX_CID_MAX+1 slots. Fixes: 65f422ad5878165be0a1eb05605aa3099536f0c8 Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index ca0ed30..a4b7e7a 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -544,8 +544,8 @@ htons(endp->cfg->osmux_port), buf, sizeof(buf)); } -/* bsc-nat allocates/releases the Osmux circuit ID */ -static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8]; +/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */ +static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8]; int osmux_used_cid(void) { -- To view, visit https://gerrit.osmocom.org/10997 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: I182c9c1a6dd28a4c5c0d8107d53852cf47541592 Gerrit-Change-Number: 10997 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 Sep 17 12:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:48:22 +0000 Subject: Change in openbsc[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10999 ) Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen ...................................................................... mgcp_osmux: Use define to calculate rtp_ssrc_winlen Since that define is already used to allocate size of osmux_cid_bitmap, let's use it here too instead of hardcoding its value. Change-Id: I768ca1b510bf44508ae064dc31620e739260470b --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index a4b7e7a..69f1c66 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -434,12 +434,12 @@ * used to reconstruct the RTP flow from osmux. The RTP SSRC is * allocated based on the circuit ID (endp->osmux.cid), which is unique * in the local scope to the BSC/BSC-NAT. We use it to divide the RTP - * SSRC space (2^32) by the 256 possible circuit IDs, then randomly + * SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, then randomly * select one value from that window. Thus, we have no chance to have * overlapping RTP SSRC traveling to the BTSes behind the BSC, * similarly, for flows traveling to the MSC. */ - static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256; + static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); if (endp->osmux.state == OSMUX_STATE_DISABLED) { LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n", -- To view, visit https://gerrit.osmocom.org/10999 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: I768ca1b510bf44508ae064dc31620e739260470b Gerrit-Change-Number: 10999 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 Sep 17 12:48:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:48:29 +0000 Subject: Change in osmo-bsc[master]: LCLS: fix codec mismatch detection In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10905 ) Change subject: LCLS: fix codec mismatch detection ...................................................................... LCLS: fix codec mismatch detection gsm_subscriber_connection.user_plane.chan_mode and .full_rate were unused since and forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" Instead of above unused struct members, use lchan->{full_rate,tch_mode}. When not explicitly allowed via VTY settings, the LCLS mechanisms will avoid to locally switch connections with different codecs/rates. For example GSM HR and GSM FR would not be locally switched. Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 6aeccb3..00c3296 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -274,15 +274,15 @@ return false; } - if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate + if (conn->lchan->type != conn->lcls.other->lchan->type && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel rate)\n"); + LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (channel type)\n"); return false; } - if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode + if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel mode)\n"); + LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (TCH-Mode)\n"); return false; } -- To view, visit https://gerrit.osmocom.org/10905 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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:49:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 12:49:16 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10998 ) Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10998 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: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb Gerrit-Change-Number: 10998 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 12:49: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 Sep 17 12:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:55:29 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#5) to the change originally created by dexter. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... gsm_data: remove unused struct member full_rate. Remove unused member gsm_subscriber_connection.user_plane.full_rate. It was forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" change-id I82e3f918295daa83274a4cf803f046979f284366 Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/10906/5 -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 12:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:55:29 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#5) to the change originally created by dexter. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... gsm_data: remove unused struct member chan_mode Remove unused gsm_subscriber_connection.user_plane.chan_mode. There is only one VTY command that displays it along other parameters, but it is used no where else. Lets remove it. It was forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" change-id I82e3f918295daa83274a4cf803f046979f284366 Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c 2 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/10907/5 -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 5 Gerrit-Owner: dexter 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 Mon Sep 17 12:55:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:55:44 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 17 Sep 2018 12:55: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 Sep 17 12:55:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 12:55:52 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Sep 2018 12:55:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 13:11:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 13:11:17 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate. In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10906 ) Change subject: gsm_data: remove unused struct member full_rate. ...................................................................... gsm_data: remove unused struct member full_rate. Remove unused member gsm_subscriber_connection.user_plane.full_rate. It was forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" change-id I82e3f918295daa83274a4cf803f046979f284366 Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: 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 e408ff9..5a922d1 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -269,9 +269,6 @@ * (The BTS side CI is handled by struct gsm_lchan and the lchan_fsm.) */ struct mgwep_ci *mgw_endpoint_ci_msc; - /* Channel rate flag requested by the MSC, FR=1, HR=0, Invalid=-1 */ - int full_rate; - /* Channel mode requested by the MSC (signalling or voice channel) */ enum gsm48_chan_mode chan_mode; -- To view, visit https://gerrit.osmocom.org/10906 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: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3 Gerrit-Change-Number: 10906 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 13:11:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 13:11:18 +0000 Subject: Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10907 ) Change subject: gsm_data: remove unused struct member chan_mode ...................................................................... gsm_data: remove unused struct member chan_mode Remove unused gsm_subscriber_connection.user_plane.chan_mode. There is only one VTY command that displays it along other parameters, but it is used no where else. Lets remove it. It was forgotten to be removed in: commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991 Date Mon May 14 18:14:15 2018 +0200 "large refactoring: use FSMs for lchans; add inter-BSC HO" change-id I82e3f918295daa83274a4cf803f046979f284366 Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: Neels Hofmeyr: 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 5a922d1..33a5a8d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -268,10 +268,6 @@ /* The connection identifier of the mgw_endpoint used to transceive RTP towards the MSC. * (The BTS side CI is handled by struct gsm_lchan and the lchan_fsm.) */ struct mgwep_ci *mgw_endpoint_ci_msc; - - /* Channel mode requested by the MSC (signalling or voice channel) */ - enum gsm48_chan_mode chan_mode; - } user_plane; /* LCLS (local call, local switch) related state */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b1938e6..d06ec57 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1472,9 +1472,8 @@ static void dump_one_subscr_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) { - vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mode=%s, mgw_ep=%s%s", + vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mgw_ep=%s%s", conn->sccp.conn_id, conn->sccp.msc->nr, conn->hodec2.failures, - get_value_string(gsm48_chan_mode_names, conn->user_plane.chan_mode), mgw_endpoint_name(conn->user_plane.mgw_endpoint), VTY_NEWLINE); if (conn->lcls.global_call_ref_len) { vty_out(vty, " LCLS GCR: %s%s", -- To view, visit https://gerrit.osmocom.org/10907 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: I10049c14ea206a4daafbdad01634d57c72a79d7c Gerrit-Change-Number: 10907 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 13:17:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 17 Sep 2018 13:17:38 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Comment-Date: Mon, 17 Sep 2018 13:17:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 13:27:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 13:27:15 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 2: Code-Review+1 let's have a look at the output this generates in a jenkins job. please create one (using jenkins-job-builder) on jenkins.osmocom.org. Please make sure that work directories are properly cleaned up after a build so we don't waste tons of disks space. -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 17 Sep 2018 13:27:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 13:43:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 13:43:06 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 2: (4 comments) a few lesser comments for now, need to run now and will continue review later... https://gerrit.osmocom.org/#/c/10932/2/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/10932/2/.gitignore at 8 PS2, Line 8: __pycache__/ technically this would be a separate patch from the rest https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py File scripts/osmo-depcheck/buildstack.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 2 PS2, Line 2: # (c) 2018 sysmocom - s.f.m.c. GmbH (You should write "Copyright ...", the (c) is just a gimmick IIUC. I typically also append "") https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py File scripts/osmo-depcheck/config.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py at 10 PS2, Line 10: # they are mentioned with PKG_CHECK_MODULES in configure.ac. indicate whether it's regex or shell glob or ... https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py at 18 PS2, Line 18: repos = {"libosmocore": ["libosmocodec", would make sense to use tuples instead of lists -- they aren't supposed to be mutable, right? ["mutable", "list",] ["single-item mutable"] vs. ("immutable", "tuple") ("single-item tuple",) general cosmetic: we like to keep lists structured so that changes to them are likely to produce single-line patches, i.e. add the final optional comma and keep braces separate. { bla: [ item, item, ], foo: [ item, ], } (not that important, just saying) -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 17 Sep 2018 13:43:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 14:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 14:12:02 +0000 Subject: Change in osmo-mgw[master]: mgcp: Fix osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10995 ) Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10995 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: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c Gerrit-Change-Number: 10995 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 14:12:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 17 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 17 Sep 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_#249?= In-Reply-To: <1820032831.137.1537110606546.JavaMail.jenkins@jenkins.osmocom.org> References: <1820032831.137.1537110606546.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <931932.148.1537197006584.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_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_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_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 -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_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 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_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 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 -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_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 Mon Sep 17 17:30:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 17:30:20 +0000 Subject: Change in osmo-gsm-tester[master]: WIP: osmo-bts-trx: Enable support for several TRX Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11000 Change subject: WIP: osmo-bts-trx: Enable support for several TRX ...................................................................... WIP: osmo-bts-trx: Enable support for several TRX Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 --- M example/defaults.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 4 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/00/11000/1 diff --git a/example/defaults.conf b/example/defaults.conf index fc4c324..42258a6 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -48,7 +48,7 @@ - phys_chan_config: PDCH - nominal_power: 23 max_power_red: 0 - arfcn: 870 + arfcn: 872 timeslot_list: - phys_chan_config: TCH/F - phys_chan_config: TCH/F @@ -76,6 +76,9 @@ - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. - phys_chan_config: TCH/F +osmo_bts_trx: + max_trx: 2 + osmo_trx: type: uhd launch_trx: true diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 1c7349f..f446dc3 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -77,7 +77,7 @@ 'osmo_trx': { 'bts_ip': self.remote_addr(), 'trx_ip': self.trx_remote_ip(), - 'channels': [{}] # TODO: implement channels for multiTRX + 'channels': [{} for trx_i in range(self.num_trx())] } } }) @@ -134,7 +134,8 @@ self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file), - '-i', self.bsc.addr()) + '-i', self.bsc.addr(), + '-t', self.num_trx()) self.suite_run.poll() class OsmoTrx(log.Origin, metaclass=ABCMeta): 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 5dba323..677b047 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -23,9 +23,11 @@ phy 0 osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip} osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip} - instance 0 +%for chan in osmo_bts_trx.osmo_trx.channels: + instance ${loop.index} osmotrx rx-gain 25 osmotrx tx-attenuation oml +%endfor bts 0 band ${osmo_bts_trx.band} ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0 @@ -44,5 +46,7 @@ gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch - trx 0 - phy 0 instance 0 +%for chan in osmo_bts_trx.osmo_trx.channels: + trx ${loop.index} + phy 0 instance ${loop.index} +%endfor diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index 2f6e830..fa87ed6 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -19,6 +19,7 @@ remote-ip ${osmo_trx.bts_ip} base-port 5700 egprs disable + multi-arfcn enable tx-sps 4 rx-sps 4 clock-ref ${osmo_trx.clock_reference} -- To view, visit https://gerrit.osmocom.org/11000 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: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 Gerrit-Change-Number: 11000 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 Sep 17 18:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 18:29:10 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Add multi_arfcn support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11001 Change subject: osmo-trx: Add multi_arfcn support ...................................................................... osmo-trx: Add multi_arfcn support 2nd TRX arfcn is changed in defaults.conf because multi_arfcn requires them to be alocated in steps of 4 starting from TRX0. It is not enabled by default yet on B200 (it must use it to support several TRX) because current host running osmo-gsm-tester is not performant enough and cannot keep up with timers due to multi-arfcn CPU overhead. Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385 --- M example/defaults.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 4 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/01/11001/1 diff --git a/example/defaults.conf b/example/defaults.conf index 7ad5e1f..42258a6 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -48,7 +48,7 @@ - phys_chan_config: PDCH - nominal_power: 23 max_power_red: 0 - arfcn: 870 + arfcn: 872 timeslot_list: - phys_chan_config: TCH/F - phys_chan_config: TCH/F diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index a4bc082..e7e3542 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -174,6 +174,8 @@ self.dbg(config_file=self.config_file) values = self.conf + multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } }) self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values)) diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 9ca5665..e043d87 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -72,6 +72,7 @@ 'bts[].osmo_trx.type': schema.STR, 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, 'bts[].osmo_trx.trx_ip': schema.IPV4, + 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, 'modem[].label': schema.STR, diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index 2f6e830..0003f1b 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -19,6 +19,11 @@ remote-ip ${osmo_trx.bts_ip} base-port 5700 egprs disable +%if osmo_trx.get('multi_arfcn', False): + multi-arfcn enable +%else: + multi-arfcn disable +%endif tx-sps 4 rx-sps 4 clock-ref ${osmo_trx.clock_reference} -- To view, visit https://gerrit.osmocom.org/11001 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: I096df82ad1f4cbb41dfbd6a78466a845f34be385 Gerrit-Change-Number: 11001 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 Sep 17 18:29:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Sep 2018 18:29:20 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Add multiTRX support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11000 ) Change subject: osmo-bts-trx: Add multiTRX support ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11000 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: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 Gerrit-Change-Number: 11000 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Sep 2018 18:29:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 18:53:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 18:53:49 +0000 Subject: Change in osmo-bts[master]: l1sap/scheduler: Consistently print chan_nr as hex number Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11002 Change subject: l1sap/scheduler: Consistently print chan_nr as hex number ...................................................................... l1sap/scheduler: Consistently print chan_nr as hex number It's very confusing if some log messages log chan_nr as decimal, while most log it as hexadecimal. Let's standardize on hex everywhere. Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503 --- M src/common/l1sap.c M src/common/scheduler.c 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/11002/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b29fcc7..1a7a965 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -508,7 +508,7 @@ lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr); if (!lchan) { LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn, - "No lchan for MPH INFO MEAS IND (chan_nr=%u)\n", info_meas_ind->chan_nr); + "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr); return 0; } @@ -746,7 +746,7 @@ } 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) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } if (L1SAP_IS_LINK_SACCH(link_id)) { @@ -875,7 +875,7 @@ 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); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } @@ -1069,7 +1069,7 @@ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%d\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); return 0; } @@ -1137,7 +1137,7 @@ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 8a6c007..65ece7f 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -329,8 +329,8 @@ found_msg: if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn)) || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) { - LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=%02x link_id=%02x, " - "expecting chan_nr=%02x link_id=%02x.\n", chan_nr, link_id, + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, " + "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id, trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id); goto free_msg; } -- To view, visit https://gerrit.osmocom.org/11002 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: Ia6566d5bbee8124fb7c689c962ce34d714208503 Gerrit-Change-Number: 11002 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 19:27:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:27:13 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15} Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11003 Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} ...................................................................... CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} This fixes a bug introduced in "CBCH: Move processing via L1SAP" commit 02d99db08b13589e1417c3448a07747f8805ba88 Author: Harald Welte Date: Fri Aug 24 23:37:45 2018 +0200 where the full channel number 0xc8 was used instead of the (right-shifted) C-bits only. Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/11003/1 diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 82299ff..cfe1a05 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -700,7 +700,7 @@ cbits = 0x10; break; case GsmL1_Sapi_Cbch: - cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */ break; case GsmL1_Sapi_Sacch: switch(pchan) { diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 35d0aa3..a02eb0d 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -357,7 +357,7 @@ cbits = 0x10; break; case cOCTVC1_GSM_SAPI_ENUM_CBCH: - cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */ break; case cOCTVC1_GSM_SAPI_ENUM_SACCH: switch (pchan) { diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index c0b42b4..acc43aa 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -697,7 +697,7 @@ cbits = 0x10; break; case GsmL1_Sapi_Cbch: - cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */ break; case GsmL1_Sapi_Sacch: switch(pchan) { -- To view, visit https://gerrit.osmocom.org/11003 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: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 Gerrit-Change-Number: 11003 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 19:27:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:27:13 +0000 Subject: Change in osmo-bts[master]: get_lchan_by_chan_nr(): Fix resolution of CBCH Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11004 Change subject: get_lchan_by_chan_nr(): Fix resolution of CBCH ...................................................................... get_lchan_by_chan_nr(): Fix resolution of CBCH The CBCH (as per GSM specs) always maps on sub-slot 2 of either the SDCCH/4 or SDCCH/8 that it replaces. However, the way how we express it as RSL-style channel number (0xC8) doesn't allow room for any sub-slots. The top 5 bits are used for expressing CBCH, while the bottom 3 bits are used for the timeslot number (TN). So when transforming from channel number to lchan, we must handle the CBCH case specially by using a hard-coded sub-slot number of 2. Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009 Related: OS#1617 --- M src/common/l1sap.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/11004/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 1a7a965..ac4f0be 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -58,7 +58,18 @@ struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx, unsigned int chan_nr) { - return &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)]; + unsigned int tn, ss; + + tn = L1SAP_CHAN2TS(chan_nr); + OSMO_ASSERT(tn < ARRAY_SIZE(trx->ts)); + + if (L1SAP_IS_CHAN_CBCH(chan_nr)) + ss = 2; /* CBCH is always on sub-slot 2 */ + else + ss = l1sap_chan2ss(chan_nr); + OSMO_ASSERT(ss < ARRAY_SIZE(trx->ts[tn].lchan)); + + return &trx->ts[tn].lchan[ss]; } static struct gsm_lchan * -- To view, visit https://gerrit.osmocom.org/11004 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: I44e2f763d5d25311167f435f2ca7e030b2a3f009 Gerrit-Change-Number: 11004 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 19:37:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:37:16 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15} In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11003 to look at the new patch set (#2). Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} ...................................................................... CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} This fixes a bug introduced in "CBCH: Move processing via L1SAP" commit 02d99db08b13589e1417c3448a07747f8805ba88 Author: Harald Welte Date: Fri Aug 24 23:37:45 2018 +0200 where the full channel number 0xc8 was used instead of the (right-shifted) C-bits only. Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c 3 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/11003/2 -- To view, visit https://gerrit.osmocom.org/11003 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: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 Gerrit-Change-Number: 11003 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 Mon Sep 17 19:41:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:41:03 +0000 Subject: Change in osmo-bts[master]: l1sap/scheduler: Consistently print chan_nr as hex number In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11002 ) Change subject: l1sap/scheduler: Consistently print chan_nr as hex number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11002 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: Ia6566d5bbee8124fb7c689c962ce34d714208503 Gerrit-Change-Number: 11002 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 19:41:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:41:24 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11003 ) Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11003 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: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 Gerrit-Change-Number: 11003 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41: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 Sep 17 19:41:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:41:42 +0000 Subject: Change in osmo-bts[master]: get_lchan_by_chan_nr(): Fix resolution of CBCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11004 ) Change subject: get_lchan_by_chan_nr(): Fix resolution of CBCH ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11004 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: I44e2f763d5d25311167f435f2ca7e030b2a3f009 Gerrit-Change-Number: 11004 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 19:41:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:41:56 +0000 Subject: Change in osmo-bts[master]: CBCH: Add FIXME comments on queue overflow/underflow handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10847 ) Change subject: CBCH: Add FIXME comments on queue overflow/underflow handling ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10847 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: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 Gerrit-Change-Number: 10847 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41: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 Sep 17 19:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:42:13 +0000 Subject: Change in osmo-bts[master]: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10848 ) Change subject: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10848 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: I85fdecbf20de83a6f925765a46b5cd14765da03e Gerrit-Change-Number: 10848 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 19:42:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 19:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 19:42:21 +0000 Subject: Change in osmo-bts[master]: l1sap/scheduler: Consistently print chan_nr as hex number In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11002 ) Change subject: l1sap/scheduler: Consistently print chan_nr as hex number ...................................................................... l1sap/scheduler: Consistently print chan_nr as hex number It's very confusing if some log messages log chan_nr as decimal, while most log it as hexadecimal. Let's standardize on hex everywhere. Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503 --- M src/common/l1sap.c M src/common/scheduler.c 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b29fcc7..1a7a965 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -508,7 +508,7 @@ lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr); if (!lchan) { LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn, - "No lchan for MPH INFO MEAS IND (chan_nr=%u)\n", info_meas_ind->chan_nr); + "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr); return 0; } @@ -746,7 +746,7 @@ } 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) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } if (L1SAP_IS_LINK_SACCH(link_id)) { @@ -875,7 +875,7 @@ 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); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } @@ -1069,7 +1069,7 @@ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%d\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); return 0; } @@ -1137,7 +1137,7 @@ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 8a6c007..65ece7f 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -329,8 +329,8 @@ found_msg: if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn)) || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) { - LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=%02x link_id=%02x, " - "expecting chan_nr=%02x link_id=%02x.\n", chan_nr, link_id, + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, " + "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id, trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id); goto free_msg; } -- To view, visit https://gerrit.osmocom.org/11002 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: Ia6566d5bbee8124fb7c689c962ce34d714208503 Gerrit-Change-Number: 11002 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 admin at opensuse.org Mon Sep 17 19:59:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 19:59:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5ba0079347aec_4c4de8c68c10164fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:58:43 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 139s] [ 126.888197] sysrq: SysRq : Power Off [ 139s] [ 126.894246] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:58:47 UTC 2018. [ 139s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 19:59:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 19:59:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5ba00793a1806_4c4de8c68c10165f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 140s] No package 'libpcsclite' found [ 140s] simtrace2-remsim.o: In function `main': [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 140s] apdu_dispatch.o: In function `apdu_segment_in': [ 140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 140s] collect2: error: ld returned 1 exit status [ 140s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 140s] make[2]: *** [simtrace2-remsim] Error 1 [ 140s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 140s] Makefile:20: recipe for target 'utils' failed [ 140s] make[1]: *** [utils] Error 2 [ 140s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 140s] dh_auto_build: make -j1 returned exit code 2 [ 140s] debian/rules:4: recipe for target 'build' failed [ 140s] make: *** [build] Error 2 [ 140s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 140s] [ 140s] lamb16 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:58:44 UTC 2018. [ 140s] [ 140s] ### VM INTERACTION START ### [ 144s] [ 131.915566] sysrq: SysRq : Power Off [ 144s] [ 131.922449] reboot: Power down [ 144s] ### VM INTERACTION END ### [ 144s] [ 144s] lamb16 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:58:48 UTC 2018. [ 144s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 19:59:52 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 19:59:52 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5ba007ceac6a9_4c4de8c68c101685c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] No package 'libpcsclite' found [ 160s] simtrace2-remsim.o: In function `main': [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 160s] apdu_dispatch.o: In function `apdu_segment_in': [ 160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 160s] collect2: error: ld returned 1 exit status [ 160s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 160s] make[2]: *** [simtrace2-remsim] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 160s] Makefile:20: recipe for target 'utils' failed [ 160s] make[1]: *** [utils] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: make -j1 returned exit code 2 [ 160s] debian/rules:4: recipe for target 'build' failed [ 160s] make: *** [build] Error 2 [ 160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 160s] [ 160s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:59:38 UTC 2018. [ 160s] [ 160s] ### VM INTERACTION START ### [ 163s] [ 151.973040] sysrq: SysRq : Power Off [ 163s] [ 151.977899] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:59:41 UTC 2018. [ 163s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 20:00:10 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 20:00:10 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5ba007cf8fc50_4c4de8c68c101693f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 189s] No package 'libpcsclite' found [ 189s] simtrace2-remsim.o: In function `main': [ 189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 189s] apdu_dispatch.o: In function `apdu_segment_in': [ 189s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 189s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 189s] collect2: error: ld returned 1 exit status [ 189s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 189s] make[2]: *** [simtrace2-remsim] Error 1 [ 189s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 189s] Makefile:20: recipe for target 'utils' failed [ 189s] make[1]: *** [utils] Error 2 [ 189s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 189s] dh_auto_build: make -j1 returned exit code 2 [ 189s] debian/rules:4: recipe for target 'build' failed [ 189s] make: *** [build] Error 2 [ 189s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 189s] [ 189s] cloud118 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:59:48 UTC 2018. [ 189s] [ 189s] ### VM INTERACTION START ### [ 192s] [ 164.810031] sysrq: SysRq : Power Off [ 192s] [ 164.815118] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] cloud118 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 19:59:59 UTC 2018. [ 199s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 20:00:44 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 20:00:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5ba00808bc53f_4c4de8c68c10170c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 219s] No package 'libpcsclite' found [ 219s] simtrace2-remsim.o: In function `main': [ 219s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 219s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 219s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 219s] apdu_dispatch.o: In function `apdu_segment_in': [ 219s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 219s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 219s] collect2: error: ld returned 1 exit status [ 219s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 219s] make[2]: *** [simtrace2-remsim] Error 1 [ 219s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 219s] Makefile:20: recipe for target 'utils' failed [ 219s] make[1]: *** [utils] Error 2 [ 219s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 219s] dh_auto_build: make -j1 returned exit code 2 [ 219s] debian/rules:4: recipe for target 'build' failed [ 219s] make: *** [build] Error 2 [ 219s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 219s] [ 219s] cloud106 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:00:32 UTC 2018. [ 219s] [ 219s] ### VM INTERACTION START ### [ 222s] [ 196.062317] sysrq: SysRq : Power Off [ 222s] [ 196.105968] reboot: Power down [ 223s] ### VM INTERACTION END ### [ 223s] [ 223s] cloud106 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:00:37 UTC 2018. [ 223s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 20:00:44 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 20:00:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5ba008099e9a3_4c4de8c68c10171b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 203s] No package 'libpcsclite' found [ 203s] simtrace2-remsim.o: In function `main': [ 203s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 203s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 203s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 203s] apdu_dispatch.o: In function `apdu_segment_in': [ 203s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 203s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 203s] collect2: error: ld returned 1 exit status [ 203s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 203s] make[2]: *** [simtrace2-remsim] Error 1 [ 203s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 203s] Makefile:20: recipe for target 'utils' failed [ 203s] make[1]: *** [utils] Error 2 [ 203s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 203s] dh_auto_build: make -j1 returned exit code 2 [ 203s] debian/rules:4: recipe for target 'build' failed [ 203s] make: *** [build] Error 2 [ 203s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 203s] [ 203s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:00:21 UTC 2018. [ 203s] [ 203s] ### VM INTERACTION START ### [ 206s] [ 175.157014] sysrq: SysRq : Power Off [ 206s] [ 175.167601] reboot: Power down [ 208s] ### VM INTERACTION END ### [ 209s] [ 209s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:00:28 UTC 2018. [ 209s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 20:00:44 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 20:00:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5ba00809d902a_4c4de8c68c1017251@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 137s] No package 'libpcsclite' found [ 137s] simtrace2-remsim.o: In function `main': [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 137s] apdu_dispatch.o: In function `apdu_segment_in': [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 137s] collect2: error: ld returned 1 exit status [ 137s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 137s] make[2]: *** [simtrace2-remsim] Error 1 [ 137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 137s] Makefile:20: recipe for target 'utils' failed [ 137s] make[1]: *** [utils] Error 2 [ 137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 137s] dh_auto_build: make -j1 returned exit code 2 [ 137s] debian/rules:4: recipe for target 'build' failed [ 137s] make: *** [build] Error 2 [ 137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 137s] [ 137s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:00:24 UTC 2018. [ 137s] [ 137s] ### VM INTERACTION START ### [ 140s] [ 130.520590] sysrq: SysRq : Power Off [ 140s] [ 130.525276] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:00:29 UTC 2018. [ 140s] -- 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 Sep 17 20:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:02:06 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15} In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11003 ) Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} ...................................................................... CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15} This fixes a bug introduced in "CBCH: Move processing via L1SAP" commit 02d99db08b13589e1417c3448a07747f8805ba88 Author: Harald Welte Date: Fri Aug 24 23:37:45 2018 +0200 where the full channel number 0xc8 was used instead of the (right-shifted) C-bits only. Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c 3 files changed, 9 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 82299ff..4093225 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -383,6 +383,8 @@ sapi = GsmL1_Sapi_Sdcch; } else if (L1SAP_IS_CHAN_BCCH(chan_nr)) { sapi = GsmL1_Sapi_Bcch; + } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) { + sapi = GsmL1_Sapi_Cbch; } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ @@ -700,7 +702,7 @@ cbits = 0x10; break; case GsmL1_Sapi_Cbch: - cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */ break; case GsmL1_Sapi_Sacch: switch(pchan) { diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 35d0aa3..40d5300 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -357,7 +357,7 @@ cbits = 0x10; break; case cOCTVC1_GSM_SAPI_ENUM_CBCH: - cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */ break; case cOCTVC1_GSM_SAPI_ENUM_SACCH: switch (pchan) { @@ -517,6 +517,8 @@ sapi = cOCTVC1_GSM_SAPI_ENUM_SDCCH; } else if (L1SAP_IS_CHAN_BCCH(chan_nr)) { sapi = cOCTVC1_GSM_SAPI_ENUM_BCCH; + } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) { + sapi = cOCTVC1_GSM_SAPI_ENUM_CBCH; } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { sapi = cOCTVC1_GSM_SAPI_ENUM_PCH_AGCH; } else { diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index c0b42b4..372e332 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -380,6 +380,8 @@ sapi = GsmL1_Sapi_Sdcch; } else if (L1SAP_IS_CHAN_BCCH(chan_nr)) { sapi = GsmL1_Sapi_Bcch; + } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) { + sapi = GsmL1_Sapi_Cbch; } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ @@ -697,7 +699,7 @@ cbits = 0x10; break; case GsmL1_Sapi_Cbch: - cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */ + cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */ break; case GsmL1_Sapi_Sacch: switch(pchan) { -- To view, visit https://gerrit.osmocom.org/11003 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: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 Gerrit-Change-Number: 11003 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 Mon Sep 17 20:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:02:06 +0000 Subject: Change in osmo-bts[master]: get_lchan_by_chan_nr(): Fix resolution of CBCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11004 ) Change subject: get_lchan_by_chan_nr(): Fix resolution of CBCH ...................................................................... get_lchan_by_chan_nr(): Fix resolution of CBCH The CBCH (as per GSM specs) always maps on sub-slot 2 of either the SDCCH/4 or SDCCH/8 that it replaces. However, the way how we express it as RSL-style channel number (0xC8) doesn't allow room for any sub-slots. The top 5 bits are used for expressing CBCH, while the bottom 3 bits are used for the timeslot number (TN). So when transforming from channel number to lchan, we must handle the CBCH case specially by using a hard-coded sub-slot number of 2. Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009 Related: OS#1617 --- M src/common/l1sap.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 1a7a965..ac4f0be 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -58,7 +58,18 @@ struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx, unsigned int chan_nr) { - return &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)]; + unsigned int tn, ss; + + tn = L1SAP_CHAN2TS(chan_nr); + OSMO_ASSERT(tn < ARRAY_SIZE(trx->ts)); + + if (L1SAP_IS_CHAN_CBCH(chan_nr)) + ss = 2; /* CBCH is always on sub-slot 2 */ + else + ss = l1sap_chan2ss(chan_nr); + OSMO_ASSERT(ss < ARRAY_SIZE(trx->ts[tn].lchan)); + + return &trx->ts[tn].lchan[ss]; } static struct gsm_lchan * -- To view, visit https://gerrit.osmocom.org/11004 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: I44e2f763d5d25311167f435f2ca7e030b2a3f009 Gerrit-Change-Number: 11004 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 Mon Sep 17 20:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:02:06 +0000 Subject: Change in osmo-bts[master]: CBCH: Add FIXME comments on queue overflow/underflow handling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10847 ) Change subject: CBCH: Add FIXME comments on queue overflow/underflow handling ...................................................................... CBCH: Add FIXME comments on queue overflow/underflow handling Change-Id: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 --- M src/common/cbch.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/cbch.c b/src/common/cbch.c index 56d76f1..7bbe2c9 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -136,6 +136,7 @@ } llist_add_tail(&scm->list, &bts->smscb_state.queue); + /* FIXME: limit queue size and optionally send CBCH LOAD Information (overflow) via RSL */ return 0; } @@ -145,8 +146,10 @@ struct smscb_msg *msg; msg = llist_first_entry_or_null(&bts->smscb_state.queue, struct smscb_msg, list); - if (!msg) + if (!msg) { + /* FIXME: send CBCH LOAD Information (underflow) via RSL */ return NULL; + } llist_del(&msg->list); -- To view, visit https://gerrit.osmocom.org/10847 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: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40 Gerrit-Change-Number: 10847 Gerrit-PatchSet: 4 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 Mon Sep 17 20:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:02:06 +0000 Subject: Change in osmo-bts[master]: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10848 ) Change subject: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure ...................................................................... CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e --- M src/common/cbch.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/cbch.c b/src/common/cbch.c index 7bbe2c9..c628cb5 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -20,6 +20,7 @@ #include +#include #include #include @@ -59,6 +60,7 @@ /* No message: Send NULL mesage */ return get_smscb_null_block(out); } + OSMO_ASSERT(msg->next_seg < 4); block_type = (struct gsm412_block_type *) out++; @@ -70,6 +72,7 @@ to_copy = GSM412_MSG_LEN - (msg->next_seg * GSM412_BLOCK_LEN); if (to_copy > GSM412_BLOCK_LEN) to_copy = GSM412_BLOCK_LEN; + OSMO_ASSERT(to_copy >= 0); /* copy data and increment index */ memcpy(out, &msg->msg[msg->next_seg * GSM412_BLOCK_LEN], to_copy); @@ -115,6 +118,8 @@ } scm = talloc_zero_size(bts, sizeof(*scm)); + if (!scm) + return -1; /* initialize entire message with default padding */ memset(scm->msg, GSM_MACBLOCK_PADDING, sizeof(scm->msg)); -- To view, visit https://gerrit.osmocom.org/10848 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: I85fdecbf20de83a6f925765a46b5cd14765da03e Gerrit-Change-Number: 10848 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Sep 17 20:02:27 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 20:02:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5ba00860851f8_4c4de8c68c1017450@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 206s] No package 'libpcsclite' found [ 206s] simtrace2-remsim.o: In function `main': [ 206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 206s] apdu_dispatch.o: In function `apdu_segment_in': [ 206s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 206s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 206s] collect2: error: ld returned 1 exit status [ 206s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 206s] make[2]: *** [simtrace2-remsim] Error 1 [ 206s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 206s] Makefile:20: recipe for target 'utils' failed [ 206s] make[1]: *** [utils] Error 2 [ 206s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 206s] dh_auto_build: make -j1 returned exit code 2 [ 206s] debian/rules:4: recipe for target 'build' failed [ 206s] make: *** [build] Error 2 [ 206s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 206s] [ 206s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:02:15 UTC 2018. [ 206s] [ 206s] ### VM INTERACTION START ### [ 209s] [ 175.128004] sysrq: SysRq : Power Off [ 209s] [ 175.132743] reboot: Power down [ 210s] ### VM INTERACTION END ### [ 210s] [ 210s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:02:19 UTC 2018. [ 210s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Sep 17 20:25:35 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 17 Sep 2018 20:25:35 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ba00dc63e9ba_4c4de8c68c10206f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 212s] No package 'libpcsclite' found [ 212s] simtrace2-remsim.o: In function `main': [ 212s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 212s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 212s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 212s] apdu_dispatch.o: In function `apdu_segment_in': [ 212s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 212s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 212s] collect2: error: ld returned 1 exit status [ 212s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 212s] make[2]: *** [simtrace2-remsim] Error 1 [ 212s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 212s] Makefile:20: recipe for target 'utils' failed [ 212s] make[1]: *** [utils] Error 2 [ 212s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 212s] dh_auto_build: make -j1 returned exit code 2 [ 212s] debian/rules:4: recipe for target 'build' failed [ 212s] make: *** [build] Error 2 [ 212s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 212s] [ 212s] armbuild22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:25:27 UTC 2018. [ 212s] [ 212s] ### VM INTERACTION START ### [ 215s] [ 202.684592] SysRq : Power Off [ 215s] [ 202.685813] reboot: Power down [ 216s] ### VM INTERACTION END ### [ 216s] [ 216s] armbuild22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 20:25:30 UTC 2018. [ 216s] -- 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 Sep 17 20:47:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:47:54 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH implementation for osmo-bts-trx Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11005 Change subject: CBCH: Fix CBCH implementation for osmo-bts-trx ...................................................................... CBCH: Fix CBCH implementation for osmo-bts-trx Unfortunately the code in Icc15603079a1709ec094f400a9bcf0008211890f was incomplete as it missed a few spots where the CBCH-enabled channel types weren't yet covered. Using this patch I can both still perform RACH / Location Update as well as actually receive SMSCB messages on an attached phone (Galaxy S5). Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6 Closes: OS#1617 Closes: OS#3559 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/11005/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2b4f5c8..faff3a0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -48,9 +48,11 @@ [GSM_PCHAN_NONE] = 8, [GSM_PCHAN_CCCH] = 4, [GSM_PCHAN_CCCH_SDCCH4] = 5, + [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 5, [GSM_PCHAN_TCH_F] = 1, [GSM_PCHAN_TCH_H] = 3, [GSM_PCHAN_SDCCH8_SACCH8C] = 7, + [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 7, [GSM_PCHAN_PDCH] = 13, /* [GSM_PCHAN_TCH_F_PDCH] not needed here, see trx_set_ts_as_pchan() */ [GSM_PCHAN_UNKNOWN] = 0, @@ -268,7 +270,8 @@ trx_sched_reset(&l1h->l1s); /* deactivate lchan for CCCH */ - if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) { + if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || + pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE); } @@ -378,7 +381,8 @@ return NM_NACK_RES_NOTAVAIL; /* activate lchan for CCCH */ - if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) { + if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || + pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); } -- To view, visit https://gerrit.osmocom.org/11005 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: I311b141668549ef37054cbe74be66bf17ac1d7e6 Gerrit-Change-Number: 11005 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 20:47:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:47:55 +0000 Subject: Change in osmo-bts[master]: CBCH: Some more scheduler_mframe cleanup Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11006 Change subject: CBCH: Some more scheduler_mframe cleanup ...................................................................... CBCH: Some more scheduler_mframe cleanup As the CBCH replaces SDCCH sub-slot-2 in downlink, we should mark the uplink as IDLE, just as the associated SACCH in uplink and downlink. Also, there are no burst_numbers in IDLE slots. Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c --- M src/common/scheduler_mframe.c 1 file changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/11006/1 diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c index b78ffa8..b969407 100644 --- a/src/common/scheduler_mframe.c +++ b/src/common/scheduler_mframe.c @@ -179,9 +179,9 @@ { 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_CCCH, 1, TRXC_IDLE, 0 }, + { TRXC_CCCH, 2, TRXC_IDLE, 0 }, + { TRXC_CCCH, 3, TRXC_IDLE, 0 }, { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 }, { TRXC_SCH, 0, TRXC_SACCH4_3, 1 }, { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 }, @@ -219,10 +219,10 @@ { 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_SACCH4_1, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 2, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 3, TRXC_IDLE, 0 }, + { TRXC_IDLE, 0, TRXC_IDLE, 0 }, { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, @@ -267,14 +267,14 @@ { 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_IDLE, 0, TRXC_SDCCH4_1, 2 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 3 }, + { TRXC_IDLE, 0, 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 }, + { TRXC_SACCH4_3, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_3, 2, TRXC_IDLE, 0 }, + { TRXC_SACCH4_3, 3, TRXC_IDLE, 0 }, + { TRXC_IDLE, 0, TRXC_IDLE, 0 }, }; static const struct trx_sched_frame frame_sdcch8[102] = { -- To view, visit https://gerrit.osmocom.org/11006 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: Ib8565d1d0080bfce5d2aec77609709a445a2171c Gerrit-Change-Number: 11006 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 20:49:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:49:18 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH implementation for osmo-bts-trx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11005 ) Change subject: CBCH: Fix CBCH implementation for osmo-bts-trx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11005 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: I311b141668549ef37054cbe74be66bf17ac1d7e6 Gerrit-Change-Number: 11005 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 20:49: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 Sep 17 20:49:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:49:26 +0000 Subject: Change in osmo-bts[master]: CBCH: Some more scheduler_mframe cleanup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11006 ) Change subject: CBCH: Some more scheduler_mframe cleanup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11006 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: Ib8565d1d0080bfce5d2aec77609709a445a2171c Gerrit-Change-Number: 11006 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 17 Sep 2018 20:49:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 20:49:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:49:53 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Add multiTRX support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11000 ) Change subject: osmo-bts-trx: Add multiTRX support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11000 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: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 Gerrit-Change-Number: 11000 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 17 Sep 2018 20:49: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 Sep 17 20:50:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:50:18 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Add multi_arfcn support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11001 ) Change subject: osmo-trx: Add multi_arfcn support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11001 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: I096df82ad1f4cbb41dfbd6a78466a845f34be385 Gerrit-Change-Number: 11001 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 17 Sep 2018 20: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 Sep 17 20:50:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:50:26 +0000 Subject: Change in osmo-mgw[master]: mgcp: Fix osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10995 ) Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10995 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: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c Gerrit-Change-Number: 10995 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: Mon, 17 Sep 2018 20: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 Mon Sep 17 20:50:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Sep 2018 20:50:50 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH implementation for osmo-bts-trx In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11005 ) Change subject: CBCH: Fix CBCH implementation for osmo-bts-trx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11005 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: I311b141668549ef37054cbe74be66bf17ac1d7e6 Gerrit-Change-Number: 11005 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Sep 2018 20:50: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 Sep 17 20:53:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Sep 2018 20:53:44 +0000 Subject: Change in osmo-bts[master]: CBCH: Fix CBCH implementation for osmo-bts-trx In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11005 ) Change subject: CBCH: Fix CBCH implementation for osmo-bts-trx ...................................................................... CBCH: Fix CBCH implementation for osmo-bts-trx Unfortunately the code in Icc15603079a1709ec094f400a9bcf0008211890f was incomplete as it missed a few spots where the CBCH-enabled channel types weren't yet covered. Using this patch I can both still perform RACH / Location Update as well as actually receive SMSCB messages on an attached phone (Galaxy S5). Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6 Closes: OS#1617 Closes: OS#3559 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 6 insertions(+), 2 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/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2b4f5c8..faff3a0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -48,9 +48,11 @@ [GSM_PCHAN_NONE] = 8, [GSM_PCHAN_CCCH] = 4, [GSM_PCHAN_CCCH_SDCCH4] = 5, + [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 5, [GSM_PCHAN_TCH_F] = 1, [GSM_PCHAN_TCH_H] = 3, [GSM_PCHAN_SDCCH8_SACCH8C] = 7, + [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 7, [GSM_PCHAN_PDCH] = 13, /* [GSM_PCHAN_TCH_F_PDCH] not needed here, see trx_set_ts_as_pchan() */ [GSM_PCHAN_UNKNOWN] = 0, @@ -268,7 +270,8 @@ trx_sched_reset(&l1h->l1s); /* deactivate lchan for CCCH */ - if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) { + if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || + pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE); } @@ -378,7 +381,8 @@ return NM_NACK_RES_NOTAVAIL; /* activate lchan for CCCH */ - if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) { + if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || + pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); } -- To view, visit https://gerrit.osmocom.org/11005 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: I311b141668549ef37054cbe74be66bf17ac1d7e6 Gerrit-Change-Number: 11005 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte 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 Mon Sep 17 20:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Sep 2018 20:59:17 +0000 Subject: Change in osmo-bts[master]: common/rsl.c: tweak log level in lapdm_rll_tx_cb() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11007 Change subject: common/rsl.c: tweak log level in lapdm_rll_tx_cb() ...................................................................... common/rsl.c: tweak log level in lapdm_rll_tx_cb() Change-Id: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/11007/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 2aa7f4d..f397e8e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2671,7 +2671,7 @@ rh = msgb_l2(msg); if (lchan->state != LCHAN_S_ACTIVE) { - LOGP(DRSL, LOGL_INFO, "%s(%s) is not active . Dropping message.\n", + LOGP(DRSL, LOGL_ERROR, "%s(%s) is not active . Dropping message.\n", gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); msgb_free(msg); return 0; -- To view, visit https://gerrit.osmocom.org/11007 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: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d Gerrit-Change-Number: 11007 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 21:00:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 21:00:48 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 2: Code-Review+1 (20 comments) It's a fact, my code review often borderlines on nitpicking. So take my comments lightly, please, especially when in braces, when they begin with 'maybe' and/or a question mark is involved. You can read all of this review if you like, but frankly, if these scripts do what they are supposed to, let's keep them like this. I did want to spend some time to review and am interested in your style, but let's avoid too much refactoring just because I couldn't shut up. In general: in some places I think the overall design could be simpler and much shorter, but the coding style is clear and mature, and I'm looking forward to more patches from you. So yes, in the end, let's see a run in jenkins as Harald said :) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py File scripts/osmo-depcheck/buildstack.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 11 PS2, Line 11: Generally, this file reads like a re-invention of the GNU Make wheel... https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 13 PS2, Line 13: def next(depends, done): some of the function names here read like generic tools, I think more concise names would help readability: next() vs. next_buildable() generate() vs. gen_build_order() print_dict() vs. print_build_order() [EDIT] Later on, when I read these names in context of its python package, some naming makes more sense to me; but still 'next()' is too unspecific IMHO https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 20 PS2, Line 20: :param done: list of programs that would already have been built at it's actually an ordered dict, not a list https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 50 PS2, Line 50: :returns: a dictionary like the following: (an *ordered* dict) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 65 PS2, Line 65: """ Print the whole build stack. oh, so now it's a stack? .. an ordered dict stack? ;) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 80 PS2, Line 80: ret = tempfile.mkdtemp(prefix="depcheck") (maybe a separator [.-_] after 'depcheck'?) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 95 PS2, Line 95: for key, value in extend.items(): (would be more readable: for env_var, tempdir in extend.items() ) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 97 PS2, Line 97: os.environ[key] = old + ":" + value if 'old' is empty, you end up producing ":new_dir". A neat trick in these cases is join: paths = (os.environ.get(key), value) os.environ[key] = ':'.join(filter(bool, paths)) The ':' will be omitted when there is only one item. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 134 PS2, Line 134: ["./configure", "--prefix", tempdir], hmm, do we need specific configure options sometimes? https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py File scripts/osmo-depcheck/dependencies.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 14 PS2, Line 14: def clone(gitdir, repository, version): clone() vs. git_clone() https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 20 PS2, Line 20: # Clone when needed This function reads like a re-invention of the osmo-build-dep.sh wheel (osmo-ci/scripts/) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 38 PS2, Line 38: def generate(gitdir, initial): generate() vs. gen_versioned_dependencies() https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 76 PS2, Line 76: def print_dict(depends): vs. print_versioned_dependencies() https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/docker.py File scripts/osmo-depcheck/docker.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/docker.py at 15 PS2, Line 15: this file reads like it could be a few lines of shell script instead? like docker-playground/*/jenkins.sh https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/osmo-depcheck.py File scripts/osmo-depcheck/osmo-depcheck.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/osmo-depcheck.py at 59 PS2, Line 59: if args.docker and "INSIDE_DOCKER" not in os.environ: This script could just do what it does, does it really need to know that it is running in docker / start a docker itself? Ideally the caller is free to launch this in a docker, or not, as desired? https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/osmo-depcheck.py at 74 PS2, Line 74: main() the (ugly) python paradigm would be if __name__ == '__main__': main() but whatever :P https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py File scripts/osmo-depcheck/parse.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py at 18 PS2, Line 18: def repository(library, version): version has nothing to do with this function, does it? https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py at 58 PS2, Line 58: ret = line.split(",")[1].split(")")[0].strip() heh, unexpected split(')') https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py at 61 PS2, Line 61: library = ret.split(" ")[0] we probably always have these spaces, but wouldn't a regex that ignores spaces be more robust? Admitted, the regex is hardly readable. r = re.compile(r'PKG_CHECK_MODULES\([^,]*, *([a-z-_]*) *(>= *([0-9.]*)|) *\)') m = r.match('PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)') m.group(1), m.group(3) ('libosmocore', '0.10.0') m2 = r.match('PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore)') m2.group(1), m2.group(3) ('libosmocore', None) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py at 80 PS2, Line 80: version = split[2] py fu: library, operator, version = split -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 17 Sep 2018 21:00:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 17 21:16:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Sep 2018 21:16:05 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: Code-Review+2 (2 comments) Looks good to me. I'm curious: how can we verify that this script catches errors? Should we create one or more "broken" feeds to make sure this script marks failure on them? https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/jenkins.sh File debian-repo-install-test/jenkins.sh: https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/jenkins.sh at 14 PS6, Line 14: --entrypoint "/testdata/repo-install-test.sh" \ interesting, --entrypoint; so far in the other jenkins.sh we place the command to run as last argument. Is there any difference? https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/testdata/repo-install-test.sh File debian-repo-install-test/testdata/repo-install-test.sh: https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/testdata/repo-install-test.sh at 42 PS6, Line 42: comm -23 /data/osmocom_packages_all.txt \ nice, a 23 on line 42! I was going to say: nice, 'comm', hadn't heard of it yet! -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 17 Sep 2018 21:16:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 06:29:18 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 18 Sep 2018 06:29:18 +0000 Subject: Change in osmo-gsm-tester[master]: build: Add overload to clone repo and build in subdirectory In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10970 ) Change subject: build: Add overload to clone repo and build in subdirectory ...................................................................... build: Add overload to clone repo and build in subdirectory To build osmo-nitb we need to clone "openbsc" and then enter the "openbsc" sub-directory. For building "mobile" and "virt_phy" of OsmocomBB we will need to do something similar. Instead of added more hardcoded paths, add a variant that allows to specify the source directory. Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53 --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-nitb.sh 2 files changed, 14 insertions(+), 9 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/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 731bf58..c2ffbb4 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -12,6 +12,7 @@ # build_repo libosmocore --configure --opts # build_repo libosmo-foo special_branch --configure --opts # build_repo osmo-bar +# build_repo_dir openbsc ./openbsc # # create_bin_tgz #-------------- @@ -98,11 +99,19 @@ build_repo() { # usage: build_repo [] [--configure-opts [...]] + dir="$1" + shift + build_repo_dir "${dir}" "./" $@ +} + +build_repo_dir() { + # usage: build_repo_dir [] [--configure-opts [...]] dep="$1" + dir="$2" branch="master" - if [ -z "$(echo "$2" | grep '^-')" ]; then + if [ -z "$(echo "$3" | grep '^-')" ]; then # second arg does not start with a dash, it's empty or a branch - branch="$2" + branch="$3" if [ -n "$branch" ]; then # we had a branch arg, need to shift once more to get config options shift @@ -111,6 +120,7 @@ fi fi shift + shift configure_opts="$@" set +x; echo " @@ -122,12 +132,7 @@ have_repo "$dep" "$branch" - cd "$dep" - - # special shim: we know the openbsc.git needs to be built in the openbsc/ subdir. - if [ "$dep" = "openbsc" ]; then - cd openbsc - fi + cd "$dep/${dir}" set +x; echo; echo; set -x autoreconf -fi diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index 1e3ecc6..4f81fa8 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -10,6 +10,6 @@ build_repo openggsn build_repo libsmpp34 build_repo libosmo-sccp -build_repo openbsc --enable-smpp --enable-osmo-bsc --enable-nat +build_repo_dir openbsc openbsc --enable-smpp --enable-osmo-bsc --enable-nat create_bin_tgz "osmo-nitb osmo-bsc_mgcp" -- To view, visit https://gerrit.osmocom.org/10970 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: I67fbd54296f2c68316bf8e89cfeb37d147193d53 Gerrit-Change-Number: 10970 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 Tue Sep 18 06:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 18 Sep 2018 06:52:49 +0000 Subject: Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges.. In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10967 ) Change subject: Install to /bin as it doesn't require special privileges.. ...................................................................... Patch Set 2: > I think since we don't plan to have binaries with spaces in path is > not worth spending time changing the logic in the osmo-gsm-tester > script. This patch is good though. Well. Either way it is the wrong place and too late to have this discussion. My personal preference is to find robust solutions and spaces in shell scripts is a bug class that keeps on giving. I think it is better to not have to worry about a class of problems than excluding them it by decree. In a parallel universe where time is a less scarce resource... I would make these bash scripts, use arrays and have a way to disambiguate bin/foo and sbin/foo.. Other sbin binaries: I think we won't find many. wget --no-parent -r http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/amd64/ for i in `ls download.opensuse.org/repositories/network\:/osmocom\:/latest/Debian_9.0/amd64/*.deb`; do dpkg -c $i | grep sbin; done returns no hit. -- To view, visit https://gerrit.osmocom.org/10967 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: Ibe572a4c17871785b623e70acc7f5da056f945e5 Gerrit-Change-Number: 10967 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Sep 2018 06:52:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 09:48:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 09:48:18 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11008 Change subject: default-suites: Remove nanobts HR1 voice test ...................................................................... default-suites: Remove nanobts HR1 voice test nanobts doesn't support this format, so it will always fail. Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc --- M example/default-suites.conf 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/08/11008/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index af7e8de..1857ba5 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -47,7 +47,6 @@ - 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-hr3 - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 @@ -58,7 +57,6 @@ - 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-hr3 - voice:nanobts+band-900+mod-bts0-dynts-ipa - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- To view, visit https://gerrit.osmocom.org/11008 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: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc Gerrit-Change-Number: 11008 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 Sep 18 11:17:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 11:17:04 +0000 Subject: Change in osmo-gsm-tester[master]: encryption: Reuse code using test lib features Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11009 Change subject: encryption: Reuse code using test lib features ...................................................................... encryption: Reuse code using test lib features Change-Id: I9b6944516c524a0c11a47aec6839f8ee9d571661 --- A suites/encryption/lib/testlib.py M suites/encryption/register_a5_0_authopt.py M suites/encryption/register_a5_0_authreq.py M suites/encryption/register_a5_1_authreq.py 4 files changed, 66 insertions(+), 125 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/09/11009/1 diff --git a/suites/encryption/lib/testlib.py b/suites/encryption/lib/testlib.py new file mode 100644 index 0000000..3948941 --- /dev/null +++ b/suites/encryption/lib/testlib.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def encryption_test_setup_run(enable_auth, algo): + 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 = suite.modem() + + print('start network...') + msc.set_authentication(enable_auth) + msc.set_encryption(algo) + bsc.set_encryption(algo) + 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) + + ms.log_info() + good_ki = ms.ki() + bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] + + print('KI changed: ' + good_ki + " => " + bad_ki) + ms.set_ki(bad_ki) + hlr.subscriber_add(ms) + if enable_auth: + print('Attempt connection with wrong KI...') + ms.connect(msc.mcc_mnc()) + + sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) + print('Asserting modem did not register') + # FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 + # assert not ms.is_connected(msc.mcc_mnc()) + assert not msc.subscriber_attached(ms) + + hlr.subscriber_delete(ms) + print('KI changed: ' + bad_ki + " => " + good_ki) + ms.set_ki(good_ki) + hlr.subscriber_add(ms, ms.msisdn) + print('Attempt connection with correct KI...') + else: + print('Attempt connection with wrong KI, should work as it is not used...') + ms.connect(msc.mcc_mnc()) + wait(ms.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms) diff --git a/suites/encryption/register_a5_0_authopt.py b/suites/encryption/register_a5_0_authopt.py index acbbb1f..1b7f471 100755 --- a/suites/encryption/register_a5_0_authopt.py +++ b/suites/encryption/register_a5_0_authopt.py @@ -1,37 +1,8 @@ #!/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 = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run -print('start network...') -msc.set_authentication(False) -msc.set_encryption('a5_0') -bsc.set_encryption('a5_0') -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) - -ms.log_info() -good_ki = ms.ki() -bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] - -print('KI changed: ' + good_ki + " => " + bad_ki) -ms.set_ki(bad_ki) -hlr.subscriber_add(ms) -print('Attempt connection with wrong KI, should work as it is not used...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +encryption_test_setup_run(False, 'a5_0') diff --git a/suites/encryption/register_a5_0_authreq.py b/suites/encryption/register_a5_0_authreq.py index 789ace5..feca525 100755 --- a/suites/encryption/register_a5_0_authreq.py +++ b/suites/encryption/register_a5_0_authreq.py @@ -1,50 +1,8 @@ #!/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 = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run -print('start network...') -msc.set_authentication(True) -msc.set_encryption('a5_0') -bsc.set_encryption('a5_0') -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) - -ms.log_info() -good_ki = ms.ki() -bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] - -print('KI changed: ' + good_ki + " => " + bad_ki) -ms.set_ki(bad_ki) -hlr.subscriber_add(ms) -print('Attempt connection with wrong KI...') -ms.connect(msc.mcc_mnc()) - -sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) -print('Asserting modem did not register') -# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 -# assert not ms.is_connected(msc.mcc_mnc()) -assert not msc.subscriber_attached(ms) - -hlr.subscriber_delete(ms) -print('KI changed: ' + bad_ki + " => " + good_ki) -ms.set_ki(good_ki) -hlr.subscriber_add(ms, ms.msisdn) -print('Attempt connection with correct KI...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +encryption_test_setup_run(True, 'a5_0') diff --git a/suites/encryption/register_a5_1_authreq.py b/suites/encryption/register_a5_1_authreq.py index e7aa76c..077819b 100755 --- a/suites/encryption/register_a5_1_authreq.py +++ b/suites/encryption/register_a5_1_authreq.py @@ -1,50 +1,8 @@ #!/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 = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run -print('start network...') -msc.set_authentication(True) -msc.set_encryption('a5_1') -bsc.set_encryption('a5_1') -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) - -ms.log_info() -good_ki = ms.ki() -bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] - -print('KI changed: ' + good_ki + " => " + bad_ki) -ms.set_ki(bad_ki) -hlr.subscriber_add(ms) -print('Attempt connection with wrong KI...') -ms.connect(msc.mcc_mnc()) - -sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) -print('Asserting modem did not register') -# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 -# assert not ms.is_connected(msc.mcc_mnc()) -assert not msc.subscriber_attached(ms) - -hlr.subscriber_delete(ms) -print('KI changed: ' + bad_ki + " => " + good_ki) -ms.set_ki(good_ki) -hlr.subscriber_add(ms, ms.msisdn) -print('Attempt connection with correct KI...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +encryption_test_setup_run(True, 'a5_1') -- To view, visit https://gerrit.osmocom.org/11009 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: I9b6944516c524a0c11a47aec6839f8ee9d571661 Gerrit-Change-Number: 11009 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 Sep 18 11:17:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 11:17:04 +0000 Subject: Change in osmo-gsm-tester[master]: suites: encryption: Add test register_a5_3_authreq Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11010 Change subject: suites: encryption: Add test register_a5_3_authreq ...................................................................... suites: encryption: Add test register_a5_3_authreq Change-Id: I279e78e741b3ca841cb8508db40874f3c17b0785 --- A suites/encryption/register_a5_3_authreq.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/10/11010/1 diff --git a/suites/encryption/register_a5_3_authreq.py b/suites/encryption/register_a5_3_authreq.py new file mode 100755 index 0000000..219c109 --- /dev/null +++ b/suites/encryption/register_a5_3_authreq.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run + +encryption_test_setup_run(True, 'a5_3') -- To view, visit https://gerrit.osmocom.org/11010 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: I279e78e741b3ca841cb8508db40874f3c17b0785 Gerrit-Change-Number: 11010 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 Sep 18 11:29:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 11:29:13 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Add multiTRX support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11000 ) Change subject: osmo-bts-trx: Add multiTRX support ...................................................................... osmo-bts-trx: Add multiTRX support Support is limited to 1 osmo-trx with 1 phy and multiple instances. Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 --- M example/defaults.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl 3 files changed, 13 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index fc4c324..7ad5e1f 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -76,6 +76,9 @@ - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. - phys_chan_config: TCH/F +osmo_bts_trx: + max_trx: 2 + osmo_trx: type: uhd launch_trx: true diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 1c7349f..a4bc082 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -77,7 +77,7 @@ 'osmo_trx': { 'bts_ip': self.remote_addr(), 'trx_ip': self.trx_remote_ip(), - 'channels': [{}] # TODO: implement channels for multiTRX + 'channels': [{} for trx_i in range(self.num_trx())] } } }) @@ -134,7 +134,8 @@ self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file), - '-i', self.bsc.addr()) + '-i', self.bsc.addr(), + '-t', str(self.num_trx())) self.suite_run.poll() class OsmoTrx(log.Origin, metaclass=ABCMeta): 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 5dba323..677b047 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -23,9 +23,11 @@ phy 0 osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip} osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip} - instance 0 +%for chan in osmo_bts_trx.osmo_trx.channels: + instance ${loop.index} osmotrx rx-gain 25 osmotrx tx-attenuation oml +%endfor bts 0 band ${osmo_bts_trx.band} ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0 @@ -44,5 +46,7 @@ gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch - trx 0 - phy 0 instance 0 +%for chan in osmo_bts_trx.osmo_trx.channels: + trx ${loop.index} + phy 0 instance ${loop.index} +%endfor -- To view, visit https://gerrit.osmocom.org/11000 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: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 Gerrit-Change-Number: 11000 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 Tue Sep 18 11:29:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 11:29:13 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Add multi_arfcn support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11001 ) Change subject: osmo-trx: Add multi_arfcn support ...................................................................... osmo-trx: Add multi_arfcn support 2nd TRX arfcn is changed in defaults.conf because multi_arfcn requires them to be alocated in steps of 4 starting from TRX0. It is not enabled by default yet on B200 (it must use it to support several TRX) because current host running osmo-gsm-tester is not performant enough and cannot keep up with timers due to multi-arfcn CPU overhead. Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385 --- M example/defaults.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 4 files changed, 9 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index 7ad5e1f..42258a6 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -48,7 +48,7 @@ - phys_chan_config: PDCH - nominal_power: 23 max_power_red: 0 - arfcn: 870 + arfcn: 872 timeslot_list: - phys_chan_config: TCH/F - phys_chan_config: TCH/F diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index a4bc082..e7e3542 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -174,6 +174,8 @@ self.dbg(config_file=self.config_file) values = self.conf + multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } }) self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values)) diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 9ca5665..e043d87 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -72,6 +72,7 @@ 'bts[].osmo_trx.type': schema.STR, 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, 'bts[].osmo_trx.trx_ip': schema.IPV4, + 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, 'modem[].label': schema.STR, diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index 2f6e830..0003f1b 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -19,6 +19,11 @@ remote-ip ${osmo_trx.bts_ip} base-port 5700 egprs disable +%if osmo_trx.get('multi_arfcn', False): + multi-arfcn enable +%else: + multi-arfcn disable +%endif tx-sps 4 rx-sps 4 clock-ref ${osmo_trx.clock_reference} -- To view, visit https://gerrit.osmocom.org/11001 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: I096df82ad1f4cbb41dfbd6a78466a845f34be385 Gerrit-Change-Number: 11001 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 Tue Sep 18 12:30:06 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 12:30:06 +0000 Subject: Change in osmo-ci[master]: jobs/coverity: only build the master branch Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11011 Change subject: jobs/coverity: only build the master branch ...................................................................... jobs/coverity: only build the master branch Otherwise the last modified branch will be build. Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 --- M jobs/coverity.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/11/11011/1 diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 3ec4bda..b37d4a4 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -29,6 +29,8 @@ url: git://git.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' + branches: + - 'origin/master' triggers: - timed: "@daily" -- To view, visit https://gerrit.osmocom.org/11011 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: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 Gerrit-Change-Number: 11011 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 12:34:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 12:34:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11012 Change subject: bsc: test Classmark Enquiry ...................................................................... bsc: test Classmark Enquiry Enhance TC_classmark to also include the BSSMAP Classmark Request -> RR Classmark Enquiry part. So far it was only testing the return path of RR Classmark Change -> BSSMAP Classmark Update. This test will thus fail with current osmo-bsc master, and will succeed as soon as osmo-bsc If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf is merged. Add: * ts_BSSMAP_ClassmarkRequest in BSSMAP_Templates.ttcn * tr_RRM_CM_ENQUIRY in L3_Templates.ttcn Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb --- M bsc/BSC_Tests.ttcn M library/BSSMAP_Templates.ttcn M library/L3_Templates.ttcn 3 files changed, 33 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/11012/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b44de9f..a99214b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1940,13 +1940,18 @@ vc_conn.done; } -/* test if L3 RR CLASSMARK CHANGE is translated to BSSMAP CLASSMARK UPDATE */ +/* test the procedure of the MSC requesting a Classmark Update: + * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, + * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); + BSSAP.send(ts_BSSMAP_ClassmarkRequest); + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_CM_ENQUIRY)); + f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2))); BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit)); setverdict(pass); diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index d92ea61..a3a50de 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -944,6 +944,18 @@ } } +template PDU_BSSAP ts_BSSMAP_ClassmarkRequest +modifies ts_BSSAP_BSSMAP := { + pdu := { + bssmap := { + classmarkRequest := { + messageType := '58'O, + talkerPriority := omit + } + } + } +} + /* return Layer3 octetstring inside BSSAP PDU */ function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring { if (ischosen(bssap.pdu.bssmap)) { diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 557b1b8..1ce84cf 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -525,6 +525,21 @@ } } +template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := { + discriminator := '0110'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + classmarkEnquiry := { + messageType := '00010011'B, + classmarkEnquiryMask := * + } + } + } +} + template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := { discriminator := '0110'B, tiOrSkip := { -- To view, visit https://gerrit.osmocom.org/11012 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: Idaab4d568cf986b4897ba008f6262c839d1592fb Gerrit-Change-Number: 11012 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 12:38:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 12:38:18 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry 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/10910 to look at the new patch set (#2). Change subject: Implement RR Classmark Enquiry ...................................................................... Implement RR Classmark Enquiry If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to the MS. (The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC, is already implemented.) Related: OS#3043 (A5/3 encryption) Related: osmo-ttcn3-hacks Idaab4d568cf986b4897ba008f6262c839d1592fb Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 3 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10910/2 -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 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 Sep 18 12:38:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 12:38:46 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry ...................................................................... Patch Set 2: tested by https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/11012 -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 18 Sep 2018 12:38:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 12:51:42 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 12:51:42 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11013 Change subject: ttcn3-sgsn-test: save the log as color/raw version ...................................................................... ttcn3-sgsn-test: save the log as color/raw version The sgsn does not save anywhere it's logfile. Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 --- M ttcn3-sgsn-test/osmo-sgsn.cfg 1 file changed, 76 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/11013/1 diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 0999c51..cebf549 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -40,6 +40,82 @@ logging level lm3ua notice logging level lmgcp notice ! +log file sgsn-color.log + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level mm debug + logging level pag notice + logging level meas notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp info + logging level llc debug + logging level sndcp debug + logging level slhc notice + logging level ranap info + logging level sua info + logging level v42bis info + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp debug + logging level lstats notice + logging level lgsup debug + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +log file sgsn-raw.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level mm debug + logging level pag notice + logging level meas notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp info + logging level llc debug + logging level sndcp debug + logging level slhc notice + logging level ranap info + logging level sua info + logging level v42bis info + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp debug + logging level lstats notice + logging level lgsup debug + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! stats interval 5 ! line vty -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 12:52:16 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 12:52:16 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11013 ) Change subject: ttcn3-sgsn-test: save the log as color/raw version ...................................................................... Patch Set 1: Verified+1 tested using a docker container. -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 12:52:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 13:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 13:09:20 +0000 Subject: Change in osmo-hlr[master]: tweak example config 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/10940 to look at the new patch set (#2). Change subject: tweak example config ...................................................................... tweak example config Remove 'logging level all' setting. Tweak some more logging details (to my current favorite). Add USSD example for showing the IMSI. Change-Id: I8296832704d779df5f1b20a595b568c99780e64d --- M doc/examples/osmo-hlr.cfg M tests/test_nodes.vty 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/40/10940/2 -- To view, visit https://gerrit.osmocom.org/10940 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: I8296832704d779df5f1b20a595b568c99780e64d Gerrit-Change-Number: 10940 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 Sep 18 13:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 13:09:21 +0000 Subject: Change in osmo-hlr[master]: make: always allow running python tests manually Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11014 Change subject: make: always allow running python tests manually ...................................................................... make: always allow running python tests manually Keep the rules to run the external-tests in tests/Makefile available for invocation, to allow conveniently launching the tests manualy without the need to pass --with-external-tests to ./configure first. Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1 --- M tests/Makefile.am 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/11014/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 7e45da4..e07749c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,6 +44,10 @@ # don't run vty and ctrl tests concurrently so that the ports don't conflict $(MAKE) vty-test $(MAKE) ctrl-test +else +python-tests: + echo "Not running python-based external tests (determined at configure-time)" +endif VTY_TEST_DB = hlr_vty_test.db @@ -75,11 +79,6 @@ -rm -f $(CTRL_TEST_DB) -rm $(CTRL_TEST_DB)-* -else -python-tests: - echo "Not running python-based tests (determined at configure-time)" -endif - check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests -- To view, visit https://gerrit.osmocom.org/11014 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: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1 Gerrit-Change-Number: 11014 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 13:41:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 13:41:49 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Use correct var to write repo name in git_hashes.txt Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11015 Change subject: contrib: Use correct var to write repo name in git_hashes.txt ...................................................................... contrib: Use correct var to write repo name in git_hashes.txt We want to write repo name in there, not $dep which actually doesn't exist in local context of have_repo function. In most cases it's actually the same because in almost all cases $dep is passed as $1 to have_repo and thus is the same as local $repo. But in a few recipes which don't use build_repo directly but instead use have_repo and build manually, $dep may not point to $repo. That's the case for osmocom-bb for instance. As a result, "libosmocore" is printed twice, were second word should be "osmocom-bb". Change-Id: I7a7db7cf4cc020295d216c60d6dc688f110916dc --- M contrib/jenkins-build-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/15/11015/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index c2ffbb4..bfe8d73 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -92,7 +92,7 @@ git rev-parse HEAD - echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt" + echo "$(git rev-parse HEAD) $repo" >> "$prefix_real/${name}_git_hashes.txt" cd "$base" } -- To view, visit https://gerrit.osmocom.org/11015 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: I7a7db7cf4cc020295d216c60d6dc688f110916dc Gerrit-Change-Number: 11015 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 Sep 18 14:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 14:06:51 +0000 Subject: Change in osmo-msc[master]: fix Classmark Update without VLR subscriber Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11016 Change subject: fix Classmark Update without VLR subscriber ...................................................................... fix Classmark Update without VLR subscriber This recent patch moves Classmark storage to the VLR subscriber, and introduced a segfault when a Classmark Update is received during IMSI detach: commit 986fe7ed18580775bed91399a1f02eae60bda251 change-id I27081bf6e9e017923b2d02607f7ea06beddad82a Mon Sep 17 01:12:13 2018 +0200 "store classmark in vlr_subscr, not conn" It assumed that we would never accept any Classmark Update messages unless we also have a valid subscriber for it. Well, that is proven wrong by the ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees. Fix: in case of no valid vlr_subscr being present, store Classmark in the conn temporarily, and copy any received Classmark to VLR subscriber as soon as it gets associated with the conn (if at all). Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 3 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/11016/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 70ac934..54026f6 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -181,6 +181,10 @@ bool waiting_for_clear_complete; } a; + + /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber + * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */ + struct gsm_classmark temporary_classmark; }; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 564e90b..0f52d09 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1739,6 +1739,22 @@ subscr->imsi, subscr->msisdn, subscr->use_count); } +static void update_classmark(const struct gsm_classmark *src, struct gsm_classmark *dst) +{ + if (src->classmark1_set) { + dst->classmark1 = src->classmark1; + dst->classmark1_set = true; + } + if (src->classmark2_len) { + dst->classmark2_len = src->classmark2_len; + memcpy(dst->classmark2, src->classmark2, sizeof(dst->classmark2)); + } + if (src->classmark3_len) { + dst->classmark3_len = src->classmark3_len; + memcpy(dst->classmark3, src->classmark3, sizeof(dst->classmark3)); + } +} + /* VLR informs us that the subscriber has been associated with a conn */ static void msc_vlr_subscr_assoc(void *msc_conn_ref, struct vlr_subscr *vsub) @@ -1749,6 +1765,11 @@ conn->vsub = vlr_subscr_get(vsub); OSMO_ASSERT(conn->vsub); conn->vsub->cs.attached_via_ran = conn->via_ran; + + /* In case we have already received Classmark Information before the VLR Subscriber was + * associated with the conn: merge the new Classmark into vsub->classmark. Don't overwrite valid + * vsub->classmark with unset classmark, though. */ + update_classmark(&conn->temporary_classmark, &conn->vsub->classmark); } static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub, diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 8efa16c..5c3f6c6 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -147,7 +147,12 @@ const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) { - struct gsm_classmark *cm = &conn->vsub->classmark; + struct gsm_classmark *cm; + + if (!conn->vsub) + cm = &conn->temporary_classmark; + else + cm = &conn->vsub->classmark; if (cm2 && cm2_len) { if (cm2_len > sizeof(cm->classmark2)) { -- To view, visit https://gerrit.osmocom.org/11016 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: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 Gerrit-Change-Number: 11016 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 14:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 14:14:08 +0000 Subject: Change in osmo-msc[master]: fix Classmark Update without VLR subscriber In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11016 to look at the new patch set (#2). Change subject: fix Classmark Update without VLR subscriber ...................................................................... fix Classmark Update without VLR subscriber This recent patch moves Classmark storage to the VLR subscriber, and introduced a segfault when a Classmark Update is received during IMSI detach: commit 986fe7ed18580775bed91399a1f02eae60bda251 change-id I27081bf6e9e017923b2d02607f7ea06beddad82a Mon Sep 17 01:12:13 2018 +0200 "store classmark in vlr_subscr, not conn" It assumed that we would never accept any Classmark Update messages unless we also have a valid subscriber for it. Well, that is proven wrong by the ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees. Fix: in case of no valid vlr_subscr being present, store Classmark in the conn temporarily, and copy any received Classmark to VLR subscriber as soon as it gets associated with the conn (if at all). Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 3 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/11016/2 -- To view, visit https://gerrit.osmocom.org/11016 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: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 Gerrit-Change-Number: 11016 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 Sep 18 14:43:05 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 18 Sep 2018 14:43:05 +0000 Subject: Change in osmo-msc[master]: fix Classmark Update without VLR subscriber In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11016 ) Change subject: fix Classmark Update without VLR subscriber ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11016 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: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 Gerrit-Change-Number: 11016 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 18 Sep 2018 14:43:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Sep 18 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 18 Sep 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_#250?= In-Reply-To: <931932.148.1537197006584.JavaMail.jenkins@jenkins.osmocom.org> References: <931932.148.1537197006584.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1972861012.166.1537283406585.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_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 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_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_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 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 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 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_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 Tue Sep 18 15:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 15:20:11 +0000 Subject: Change in osmo-hlr[master]: tweak example config In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10940 ) Change subject: tweak example config ...................................................................... Patch Set 2: Code-Review+2 re-add previous +2 due to trivial test expectation fix -- To view, visit https://gerrit.osmocom.org/10940 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: I8296832704d779df5f1b20a595b568c99780e64d Gerrit-Change-Number: 10940 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 18 Sep 2018 15:20: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 Sep 18 15:20:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Sep 2018 15:20:18 +0000 Subject: Change in osmo-hlr[master]: tweak example config In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10940 ) Change subject: tweak example config ...................................................................... tweak example config Remove 'logging level all' setting. Tweak some more logging details (to my current favorite). Add USSD example for showing the IMSI. Change-Id: I8296832704d779df5f1b20a595b568c99780e64d --- M doc/examples/osmo-hlr.cfg M tests/test_nodes.vty 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg index 35d942d..54993a9 100644 --- a/doc/examples/osmo-hlr.cfg +++ b/doc/examples/osmo-hlr.cfg @@ -5,9 +5,10 @@ logging filter all 1 logging color 1 logging print category 1 - logging timestamp 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 - logging level all notice logging level main notice logging level db notice logging level auc notice @@ -22,3 +23,4 @@ gsup bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn + ussd route prefix *#101# internal own-imsi diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index d2c455f..95e132d 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -117,4 +117,5 @@ gsup bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn + ussd route prefix *#101# internal own-imsi end -- To view, visit https://gerrit.osmocom.org/10940 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: I8296832704d779df5f1b20a595b568c99780e64d Gerrit-Change-Number: 10940 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 Sep 18 15:23:46 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 15:23:46 +0000 Subject: Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11017 Change subject: coverity: ensure the systemd install directory is /tmp ...................................................................... coverity: ensure the systemd install directory is /tmp Because the systemd install directory does not use --prefix as base. For this reason, the build failed before, because installing to /lib/systemd failed. Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/11017/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 920c0b9..485355a 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -12,7 +12,7 @@ do_build() { autoreconf --install --force - ./configure --prefix="$prefix" $* + ./configure --prefix="$prefix" --with-systemdsystemunitdir=/tmp/ $* make $PARALLEL_MAKE make install -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 15:41:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 15:41:40 +0000 Subject: Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: ensure the systemd install directory is /tmp ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh File coverity/build_Osmocom.sh: https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh at 15 PS1, Line 15: ./configure --prefix="$prefix" --with-systemdsystemunitdir=/tmp/ $* If you don't care about the files (that's why you use /tmp right?) then pass one of these, I think any is enough to void installing systemd services: --without-systemdsystemunitdir --with-systemdsystemunitdir=no --with-systemdsystemunitdir= -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Sep 2018 15:41:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 15:51:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Sep 2018 15:51:18 +0000 Subject: Change in osmo-msc[master]: fix Classmark Update without VLR subscriber In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11016 ) Change subject: fix Classmark Update without VLR subscriber ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11016 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: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 Gerrit-Change-Number: 11016 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 18 Sep 2018 15:51:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:00:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Sep 2018 16:00:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11012 ) Change subject: bsc: test Classmark Enquiry ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11012 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: Idaab4d568cf986b4897ba008f6262c839d1592fb Gerrit-Change-Number: 11012 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 16:00: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 Sep 18 16:06:20 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:06:20 +0000 Subject: Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: ensure the systemd install directory is /tmp ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh File coverity/build_Osmocom.sh: https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh at 15 PS1, Line 15: ./configure --prefix="$prefix" --with-systemdsystemunitdir=/tmp/ $* > If you don't care about the files (that's why you use /tmp right?) then pass one of these, I think a [?] testing it with "=no" https://jenkins.osmocom.org/jenkins/job/osmocom-coverity/236/console -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 16:06:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:06:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Sep 2018 16:06:54 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 16:06: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 Sep 18 16:09:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Sep 2018 16:09:24 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11008 ) Change subject: default-suites: Remove nanobts HR1 voice test ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11008/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11008/1//COMMIT_MSG at 9 PS1, Line 9: format Would be better to write 'codec'. -- To view, visit https://gerrit.osmocom.org/11008 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: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc Gerrit-Change-Number: 11008 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 16:09:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:25:27 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:25:27 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: remove ofono from the dependencies In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/9458 ) Change subject: ansible: gsm-tester: remove ofono from the dependencies ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Id679e3fb165441b357a5ff11f240f4792dcd9dc8 Gerrit-Change-Number: 9458 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:25:43 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:25:43 +0000 Subject: Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: ensure the systemd install directory is /tmp ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh File coverity/build_Osmocom.sh: https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh at 15 PS1, Line 15: ./configure --prefix="$prefix" --with-systemdsystemunitdir=/tmp/ $* > testing it with "=no" https://jenkins.osmocom. [?] the old jenkins job had the wrong version. https://jenkins.osmocom.org/jenkins/job/osmocom-coverity/238/ -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 16:25:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:26:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Sep 2018 16:26:00 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test 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/11008 to look at the new patch set (#2). Change subject: default-suites: Remove nanobts HR1 voice test ...................................................................... default-suites: Remove nanobts HR1 voice test nanobts doesn't support this codec, so it will always fail. Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc --- M example/default-suites.conf 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/08/11008/2 -- To view, visit https://gerrit.osmocom.org/11008 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: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc Gerrit-Change-Number: 11008 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol 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 Tue Sep 18 16:26:06 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:26:06 +0000 Subject: Change in osmo-sgsn[master]: vty: restart sgsn state: improve output message Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11018 Change subject: vty: restart sgsn state: improve output message ...................................................................... vty: restart sgsn state: improve output message Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7 --- M src/gprs/sgsn_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/18/11018/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 154e576..de193f0 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -824,7 +824,7 @@ vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE); gtp_clear_queues(sgsn->gsn); - vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE); + vty_out(vty, "Flushed rx & tx queus towards the GGSN.%s", VTY_NEWLINE); /* remove all queues to bssgp */ return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/11018 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: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7 Gerrit-Change-Number: 11018 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:26:06 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:26:06 +0000 Subject: Change in osmo-sgsn[master]: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11019 Change subject: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable ...................................................................... sgsn_libgtp: fix a potential memleak when the GGSN is not reachable When a MS does the following - MS: GMM Attach Activate - MS: Activate PDP CTX - SGNS: send Request Ctx to GSGSN which does not answer - GMM Detach (MM ctx get freed) - libgtp retrans timeout of the first answer - sgsn_libgtp.c: create_pdp_conf() which ignores this ctx because of emtpy MM ctx Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf --- M src/gprs/sgsn_libgtp.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/19/11019/1 diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 7829796..478d402 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -390,15 +390,13 @@ static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) { struct sgsn_pdp_ctx *pctx = cbp; - uint8_t reject_cause; + uint8_t reject_cause = 0; LOGPDPCTXP(LOGL_INFO, pctx, "Received CREATE PDP CTX CONF, cause=%d(%s)\n", cause, get_value_string(gtp_cause_strs, cause)); if (!pctx->mm) { - LOGP(DGPRS, LOGL_INFO, - "No MM context, aborting CREATE PDP CTX CONF\n"); - return -EIO; + goto reject; } /* Check for cause value if it was really successful */ @@ -452,9 +450,11 @@ if (pdp) pdp_freepdp(pdp); + /* Send PDP CTX ACT REJ to MS */ - gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause, - 0, NULL); + if (pctx->mm) + gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause, + 0, NULL); sgsn_pdp_ctx_free(pctx); return EOF; -- To view, visit https://gerrit.osmocom.org/11019 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: I4575f7f80f785a62ae3b7f165d236a9dd818aabf Gerrit-Change-Number: 11019 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:26:07 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:26:07 +0000 Subject: Change in osmo-sgsn[master]: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11020 Change subject: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone ...................................................................... sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone When the GGSN crashs, the SGSN will be notified after it comes back. Because of the async operation, the mm ctx could be already gone. Change-Id: I507a8c2193c84f8dff7f5d669adcd3583331f289 --- M src/gprs/gprs_sgsn.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/20/11020/1 diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 977ae48..dc0e7c0 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -707,7 +707,9 @@ void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx) { - if (pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) { + /* the MM context can be deleted while the GGSN is not reachable or + * if has been crashed. */ + if (pctx->mm && pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) { gsm48_tx_gsm_deact_pdp_req(pctx, GSM_CAUSE_NET_FAIL, true); sgsn_ggsn_ctx_remove_pdp(pctx->ggsn, pctx); } else { -- To view, visit https://gerrit.osmocom.org/11020 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: I507a8c2193c84f8dff7f5d669adcd3583331f289 Gerrit-Change-Number: 11020 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 16:26:07 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 16:26:07 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11021 Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... gprs_sgsn.h: fix wrong type of re-attempts The GMM ctx->gmm_att_req.auth_reattempt is used to track multiple UTMS re-sync attempt of a MS. Change-Id: I708226cec9e131dcda4234f42ed3689f4f6750e8 Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM") Fixes: OS#3556 --- M include/osmocom/sgsn/gprs_sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/21/11021/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index a5ca959..f745685 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -176,7 +176,7 @@ * the fsm needs to compare it against old to decide what to do */ struct msgb *attach_req; uint32_t id_type; - bool auth_reattempt; + int auth_reattempt; /* tracking UMTS resync auth attempts */ } gmm_att_req; /* VLR number */ uint32_t new_sgsn_addr; -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 18:09:16 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 18:09:16 +0000 Subject: Change in osmo-sgsn[master]: gprs_llc: remove the FCS from the msgb by trim'ing the msgb Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11022 Change subject: gprs_llc: remove the FCS from the msgb by trim'ing the msgb ...................................................................... gprs_llc: remove the FCS from the msgb by trim'ing the msgb After checking the FCS, it's no use. The FCS should also not appear on `hexdump(msgb_l3(MSG), msgb_l3len(MSG))`. Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8 --- M src/gprs/gprs_llc.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/11022/1 diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c index 6c92f83..abbb742 100644 --- a/src/gprs/gprs_llc.c +++ b/src/gprs/gprs_llc.c @@ -945,6 +945,9 @@ LOGP(DLLC, LOGL_INFO, "Dropping frame with invalid FCS\n"); return -EIO; } + /* set l3 layer & remove the fcs */ + msg->l3h = llhp.data; + msgb_l3trim(msg, llhp.data_len); /* Update LLE's (BVCI, NSEI) tuple */ lle->llme->bvci = msgb_bvci(msg); @@ -960,7 +963,6 @@ /* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */ if (llhp.cmd == GPRS_LLC_UI && llhp.data && llhp.data_len) { - msgb_gmmh(msg) = llhp.data; switch (llhp.sapi) { case GPRS_SAPI_GMM: /* send LL_UNITDATA_IND to GMM */ -- To view, visit https://gerrit.osmocom.org/11022 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: I27e061ead86395a336b67c7aead93d305a0f2ae8 Gerrit-Change-Number: 11022 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 18:09:16 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 18:09:16 +0000 Subject: Change in osmo-sgsn[master]: GTP: refactor the echo timer Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11023 Change subject: GTP: refactor the echo timer ...................................................................... GTP: refactor the echo timer The gtp echo timer must be re-check everytime the echo-timer has been modified or deactivated. Fixes the TTCN3 SGSN_Tests.TC_attach_restart_ctr_echo Change-Id: Ia33471a9a9cfc3887facb665c82094b99932052a --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c 3 files changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/23/11023/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index f745685..2658bd6 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -375,6 +375,7 @@ int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct sgsn_pdp_ctx *except); void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); +void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc); struct apn_ctx { struct llist_head list; diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index dc0e7c0..16ba979 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -489,12 +489,24 @@ talloc_free(pdp); } +void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc) +{ + if (llist_empty(&ggc->pdp_list) || ggc->echo_interval <= 0) { + /* stop timer */ + if (osmo_timer_pending(&ggc->echo_timer)) + osmo_timer_del(&ggc->echo_timer); + } else { + /* re-start timer */ + sgsn_ggsn_echo_req(ggc); + osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); + } +} + /* GGSN contexts */ static void echo_timer_cb(void *data) { struct sgsn_ggsn_ctx *ggc = (struct sgsn_ggsn_ctx *) data; - sgsn_ggsn_echo_req(ggc); - osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); + sgsn_ggsn_ctx_check_echo_timer(ggc); } struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id) @@ -742,15 +754,14 @@ void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp) { - if (llist_empty(&ggc->pdp_list) && ggc->echo_interval > 0) - osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); + sgsn_ggsn_ctx_check_echo_timer(ggc); + llist_add(&pdp->ggsn_list, &ggc->pdp_list); } void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp) { llist_del(&pdp->ggsn_list); - if (llist_empty(&ggc->pdp_list) && osmo_timer_pending(&ggc->echo_timer)) - osmo_timer_del(&ggc->echo_timer); + sgsn_ggsn_ctx_check_echo_timer(ggc); if (pdp->destroy_ggsn) sgsn_ggsn_ctx_free(pdp->ggsn); pdp->ggsn = NULL; diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index de193f0..63985bc 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -383,6 +383,7 @@ "not be lower than 60 seconds, use this value for " \ "testing purposes only!%s", VTY_NEWLINE); + sgsn_ggsn_ctx_check_echo_timer(ggc); return CMD_SUCCESS; } @@ -395,6 +396,7 @@ struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id); ggc->echo_interval = -1; + sgsn_ggsn_ctx_check_echo_timer(ggc); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/11023 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: Ia33471a9a9cfc3887facb665c82094b99932052a Gerrit-Change-Number: 11023 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 18 20:12:21 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:12:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ba15c3b92e92_3977fb268817005c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 283s] No package 'libpcsclite' found [ 283s] simtrace2-remsim.o: In function `main': [ 283s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 283s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 283s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 283s] apdu_dispatch.o: In function `apdu_segment_in': [ 283s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 283s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 283s] collect2: error: ld returned 1 exit status [ 283s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 283s] make[2]: *** [simtrace2-remsim] Error 1 [ 283s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 283s] Makefile:20: recipe for target 'utils' failed [ 283s] make[1]: *** [utils] Error 2 [ 283s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 283s] dh_auto_build: make -j1 returned exit code 2 [ 283s] debian/rules:4: recipe for target 'build' failed [ 283s] make: *** [build] Error 2 [ 283s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 283s] [ 283s] armbuild13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:12:13 UTC 2018. [ 283s] [ 283s] ### VM INTERACTION START ### [ 286s] [ 253.542548] SysRq : Power Off [ 286s] [ 253.543991] reboot: Power down [ 287s] ### VM INTERACTION END ### [ 287s] [ 287s] armbuild13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:12:16 UTC 2018. [ 287s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 18 20:14:21 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:14:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5ba15cb18b86a_3977fb268817038a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 218s] No package 'libpcsclite' found [ 218s] simtrace2-remsim.o: In function `main': [ 218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 218s] apdu_dispatch.o: In function `apdu_segment_in': [ 218s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 218s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 218s] collect2: error: ld returned 1 exit status [ 218s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 218s] make[2]: *** [simtrace2-remsim] Error 1 [ 218s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 218s] Makefile:20: recipe for target 'utils' failed [ 218s] make[1]: *** [utils] Error 2 [ 218s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 218s] dh_auto_build: make -j1 returned exit code 2 [ 218s] debian/rules:4: recipe for target 'build' failed [ 218s] make: *** [build] Error 2 [ 218s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 218s] [ 218s] cloud121 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:14:11 UTC 2018. [ 218s] [ 218s] ### VM INTERACTION START ### [ 221s] [ 180.858453] sysrq: SysRq : Power Off [ 221s] [ 180.906656] reboot: Power down [ 222s] ### VM INTERACTION END ### [ 222s] [ 222s] cloud121 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:14:16 UTC 2018. [ 222s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 18 20:18:56 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:18:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5ba15dbed18f7_3977fb268817121f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 186s] No package 'libpcsclite' found [ 186s] simtrace2-remsim.o: In function `main': [ 186s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 186s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 186s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 186s] apdu_dispatch.o: In function `apdu_segment_in': [ 186s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 186s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 186s] collect2: error: ld returned 1 exit status [ 186s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 186s] make[2]: *** [simtrace2-remsim] Error 1 [ 186s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 186s] Makefile:20: recipe for target 'utils' failed [ 186s] make[1]: *** [utils] Error 2 [ 186s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 186s] dh_auto_build: make -j1 returned exit code 2 [ 186s] debian/rules:4: recipe for target 'build' failed [ 186s] make: *** [build] Error 2 [ 186s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 186s] [ 186s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:18:49 UTC 2018. [ 186s] [ 186s] ### VM INTERACTION START ### [ 189s] [ 176.854239] sysrq: SysRq : Power Off [ 189s] [ 176.872970] reboot: Power down [ 189s] ### VM INTERACTION END ### [ 189s] [ 189s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:18:53 UTC 2018. [ 189s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 18 20:18:56 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:18:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5ba15dbfbea28_3977fb268817148e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 139s] No package 'libpcsclite' found [ 139s] simtrace2-remsim.o: In function `main': [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 139s] apdu_dispatch.o: In function `apdu_segment_in': [ 139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 139s] collect2: error: ld returned 1 exit status [ 139s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 139s] make[2]: *** [simtrace2-remsim] Error 1 [ 139s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 139s] Makefile:20: recipe for target 'utils' failed [ 139s] make[1]: *** [utils] Error 2 [ 139s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 139s] dh_auto_build: make -j1 returned exit code 2 [ 139s] debian/rules:4: recipe for target 'build' failed [ 139s] make: *** [build] Error 2 [ 139s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 139s] [ 139s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:18:40 UTC 2018. [ 139s] [ 139s] ### VM INTERACTION START ### [ 142s] [ 132.292678] sysrq: SysRq : Power Off [ 142s] [ 132.298435] reboot: Power down [ 142s] ### VM INTERACTION END ### [ 142s] [ 142s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:18:44 UTC 2018. [ 142s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 18 20:20:21 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:20:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5ba15e189cfc4_3977fb2688171729@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 245s] No package 'libpcsclite' found [ 245s] simtrace2-remsim.o: In function `main': [ 245s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 245s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 245s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 245s] apdu_dispatch.o: In function `apdu_segment_in': [ 245s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 245s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 245s] collect2: error: ld returned 1 exit status [ 245s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 245s] make[2]: *** [simtrace2-remsim] Error 1 [ 245s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 245s] Makefile:20: recipe for target 'utils' failed [ 245s] make[1]: *** [utils] Error 2 [ 245s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 245s] dh_auto_build: make -j1 returned exit code 2 [ 245s] debian/rules:4: recipe for target 'build' failed [ 245s] make: *** [build] Error 2 [ 245s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 245s] [ 245s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:20:03 UTC 2018. [ 245s] [ 245s] ### VM INTERACTION START ### [ 249s] [ 233.774758] sysrq: SysRq : Power Off [ 249s] [ 233.865475] reboot: Power down [ 249s] ### VM INTERACTION END ### [ 249s] [ 249s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:20:07 UTC 2018. [ 249s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:21:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:21:43 +0000 Subject: Change in osmo-sgsn[master]: vty: restart sgsn state: improve output message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11018 ) Change subject: vty: restart sgsn state: improve output message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11018 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: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7 Gerrit-Change-Number: 11018 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:21:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 18 20:26:04 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:26:04 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5ba15f65c70b5_3977fb26881742b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 199s] No package 'libpcsclite' found [ 199s] simtrace2-remsim.o: In function `main': [ 199s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 199s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 199s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 199s] apdu_dispatch.o: In function `apdu_segment_in': [ 199s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 199s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 199s] collect2: error: ld returned 1 exit status [ 199s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 199s] make[2]: *** [simtrace2-remsim] Error 1 [ 199s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 199s] Makefile:20: recipe for target 'utils' failed [ 199s] make[1]: *** [utils] Error 2 [ 199s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 199s] dh_auto_build: make -j1 returned exit code 2 [ 199s] debian/rules:4: recipe for target 'build' failed [ 199s] make: *** [build] Error 2 [ 199s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 199s] [ 199s] lamb04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:25:46 UTC 2018. [ 199s] [ 199s] ### VM INTERACTION START ### [ 203s] [ 190.467958] sysrq: SysRq : Power Off [ 203s] [ 190.473415] reboot: Power down [ 203s] ### VM INTERACTION END ### [ 203s] [ 203s] lamb04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:25:50 UTC 2018. [ 203s] -- 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 Sep 18 20:28:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:28:12 +0000 Subject: Change in osmo-sgsn[master]: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11020 ) Change subject: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11020 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: I507a8c2193c84f8dff7f5d669adcd3583331f289 Gerrit-Change-Number: 11020 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:28:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 18 20:28:07 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:28:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5ba15fde335f8_3977fb26881750a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 168s] No package 'libpcsclite' found [ 168s] simtrace2-remsim.o: In function `main': [ 168s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 168s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 168s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 168s] apdu_dispatch.o: In function `apdu_segment_in': [ 168s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 168s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 168s] collect2: error: ld returned 1 exit status [ 168s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 168s] make[2]: *** [simtrace2-remsim] Error 1 [ 168s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 168s] Makefile:20: recipe for target 'utils' failed [ 168s] make[1]: *** [utils] Error 2 [ 168s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 168s] dh_auto_build: make -j1 returned exit code 2 [ 168s] debian/rules:4: recipe for target 'build' failed [ 168s] make: *** [build] Error 2 [ 168s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 168s] [ 168s] lamb62 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:27:56 UTC 2018. [ 168s] [ 168s] ### VM INTERACTION START ### [ 171s] [ 160.135761] sysrq: SysRq : Power Off [ 171s] [ 160.150920] reboot: Power down [ 171s] ### VM INTERACTION END ### [ 171s] [ 171s] lamb62 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:27:59 UTC 2018. [ 171s] -- 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 Sep 18 20:28:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:28:24 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11021 ) Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:28: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 Sep 18 20:29:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:29:06 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11008 ) Change subject: default-suites: Remove nanobts HR1 voice test ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11008 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: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc Gerrit-Change-Number: 11008 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 20:29:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:29:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:29:07 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11008 ) Change subject: default-suites: Remove nanobts HR1 voice test ...................................................................... default-suites: Remove nanobts HR1 voice test nanobts doesn't support this codec, so it will always fail. Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc --- M example/default-suites.conf 1 file changed, 0 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 af7e8de..1857ba5 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -47,7 +47,6 @@ - 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-hr3 - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 @@ -58,7 +57,6 @@ - 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-hr3 - voice:nanobts+band-900+mod-bts0-dynts-ipa - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- To view, visit https://gerrit.osmocom.org/11008 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: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc Gerrit-Change-Number: 11008 Gerrit-PatchSet: 3 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 admin at opensuse.org Tue Sep 18 20:28:58 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:28:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5ba1601825327_3977fb26881751f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 298s] No package 'libpcsclite' found [ 298s] simtrace2-remsim.o: In function `main': [ 298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 298s] apdu_dispatch.o: In function `apdu_segment_in': [ 298s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 298s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 298s] collect2: error: ld returned 1 exit status [ 298s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 298s] make[2]: *** [simtrace2-remsim] Error 1 [ 298s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 298s] Makefile:20: recipe for target 'utils' failed [ 298s] make[1]: *** [utils] Error 2 [ 298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 298s] dh_auto_build: make -j1 returned exit code 2 [ 298s] debian/rules:4: recipe for target 'build' failed [ 298s] make: *** [build] Error 2 [ 298s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 298s] [ 298s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:28:39 UTC 2018. [ 298s] [ 298s] ### VM INTERACTION START ### [ 301s] [ 266.420488] sysrq: SysRq : Power Off [ 301s] [ 266.466367] reboot: Power down [ 302s] ### VM INTERACTION END ### [ 302s] [ 302s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:28:44 UTC 2018. [ 302s] -- 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 Sep 18 20:29:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:29:33 +0000 Subject: Change in osmo-gsm-tester[master]: encryption: Reuse code using test lib features In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11009 ) Change subject: encryption: Reuse code using test lib features ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11009 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: I9b6944516c524a0c11a47aec6839f8ee9d571661 Gerrit-Change-Number: 11009 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:29: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 Sep 18 20:30:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:30:14 +0000 Subject: Change in osmo-gsm-tester[master]: suites: encryption: Add test register_a5_3_authreq In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11010 ) Change subject: suites: encryption: Add test register_a5_3_authreq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11010 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: I279e78e741b3ca841cb8508db40874f3c17b0785 Gerrit-Change-Number: 11010 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:30:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:30:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:30:35 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Use correct var to write repo name in git_hashes.txt In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11015 ) Change subject: contrib: Use correct var to write repo name in git_hashes.txt ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11015 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: I7a7db7cf4cc020295d216c60d6dc688f110916dc Gerrit-Change-Number: 11015 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:30:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 18 20:30:41 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 18 Sep 2018 20:30:41 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5ba160746d08c_3977fb2688175765@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 349s] No package 'libpcsclite' found [ 349s] simtrace2-remsim.o: In function `main': [ 349s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 349s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 349s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 349s] apdu_dispatch.o: In function `apdu_segment_in': [ 349s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 349s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 349s] collect2: error: ld returned 1 exit status [ 349s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 349s] make[2]: *** [simtrace2-remsim] Error 1 [ 349s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 349s] Makefile:20: recipe for target 'utils' failed [ 349s] make[1]: *** [utils] Error 2 [ 349s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 349s] dh_auto_build: make -j1 returned exit code 2 [ 349s] debian/rules:4: recipe for target 'build' failed [ 349s] make: *** [build] Error 2 [ 349s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 349s] [ 349s] lamb53 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:30:24 UTC 2018. [ 349s] [ 349s] ### VM INTERACTION START ### [ 352s] [ 335.319696] sysrq: SysRq : Power Off [ 352s] [ 335.358054] reboot: Power down [ 352s] ### VM INTERACTION END ### [ 352s] [ 352s] lamb53 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 20:30:28 UTC 2018. [ 352s] -- 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 Sep 18 20:32:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:32:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11012 ) Change subject: bsc: test Classmark Enquiry ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11012 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: Idaab4d568cf986b4897ba008f6262c839d1592fb Gerrit-Change-Number: 11012 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 20:32: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 Sep 18 20:32:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:32:29 +0000 Subject: Change in osmo-msc[master]: fix Classmark Update without VLR subscriber In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11016 ) Change subject: fix Classmark Update without VLR subscriber ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11016 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: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 Gerrit-Change-Number: 11016 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 18 Sep 2018 20:32: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 Sep 18 20:32:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:32:31 +0000 Subject: Change in osmo-msc[master]: fix Classmark Update without VLR subscriber In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11016 ) Change subject: fix Classmark Update without VLR subscriber ...................................................................... fix Classmark Update without VLR subscriber This recent patch moves Classmark storage to the VLR subscriber, and introduced a segfault when a Classmark Update is received during IMSI detach: commit 986fe7ed18580775bed91399a1f02eae60bda251 change-id I27081bf6e9e017923b2d02607f7ea06beddad82a Mon Sep 17 01:12:13 2018 +0200 "store classmark in vlr_subscr, not conn" It assumed that we would never accept any Classmark Update messages unless we also have a valid subscriber for it. Well, that is proven wrong by the ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees. Fix: in case of no valid vlr_subscr being present, store Classmark in the conn temporarily, and copy any received Classmark to VLR subscriber as soon as it gets associated with the conn (if at all). Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 3 files changed, 31 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 70ac934..54026f6 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -181,6 +181,10 @@ bool waiting_for_clear_complete; } a; + + /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber + * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */ + struct gsm_classmark temporary_classmark; }; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 564e90b..0f52d09 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1739,6 +1739,22 @@ subscr->imsi, subscr->msisdn, subscr->use_count); } +static void update_classmark(const struct gsm_classmark *src, struct gsm_classmark *dst) +{ + if (src->classmark1_set) { + dst->classmark1 = src->classmark1; + dst->classmark1_set = true; + } + if (src->classmark2_len) { + dst->classmark2_len = src->classmark2_len; + memcpy(dst->classmark2, src->classmark2, sizeof(dst->classmark2)); + } + if (src->classmark3_len) { + dst->classmark3_len = src->classmark3_len; + memcpy(dst->classmark3, src->classmark3, sizeof(dst->classmark3)); + } +} + /* VLR informs us that the subscriber has been associated with a conn */ static void msc_vlr_subscr_assoc(void *msc_conn_ref, struct vlr_subscr *vsub) @@ -1749,6 +1765,11 @@ conn->vsub = vlr_subscr_get(vsub); OSMO_ASSERT(conn->vsub); conn->vsub->cs.attached_via_ran = conn->via_ran; + + /* In case we have already received Classmark Information before the VLR Subscriber was + * associated with the conn: merge the new Classmark into vsub->classmark. Don't overwrite valid + * vsub->classmark with unset classmark, though. */ + update_classmark(&conn->temporary_classmark, &conn->vsub->classmark); } static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub, diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 8efa16c..3965e9b 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -147,7 +147,12 @@ const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) { - struct gsm_classmark *cm = &conn->vsub->classmark; + struct gsm_classmark *cm; + + if (!conn->vsub) + cm = &conn->temporary_classmark; + else + cm = &conn->vsub->classmark; if (cm2 && cm2_len) { if (cm2_len > sizeof(cm->classmark2)) { -- To view, visit https://gerrit.osmocom.org/11016 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: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 Gerrit-Change-Number: 11016 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:32:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:32:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11012 ) Change subject: bsc: test Classmark Enquiry ...................................................................... bsc: test Classmark Enquiry Enhance TC_classmark to also include the BSSMAP Classmark Request -> RR Classmark Enquiry part. So far it was only testing the return path of RR Classmark Change -> BSSMAP Classmark Update. This test will thus fail with current osmo-bsc master, and will succeed as soon as osmo-bsc If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf is merged. Add: * ts_BSSMAP_ClassmarkRequest in BSSMAP_Templates.ttcn * tr_RRM_CM_ENQUIRY in L3_Templates.ttcn Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb --- M bsc/BSC_Tests.ttcn M library/BSSMAP_Templates.ttcn M library/L3_Templates.ttcn 3 files changed, 33 insertions(+), 1 deletion(-) 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/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b44de9f..a99214b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1940,13 +1940,18 @@ vc_conn.done; } -/* test if L3 RR CLASSMARK CHANGE is translated to BSSMAP CLASSMARK UPDATE */ +/* test the procedure of the MSC requesting a Classmark Update: + * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, + * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); + BSSAP.send(ts_BSSMAP_ClassmarkRequest); + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_CM_ENQUIRY)); + f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2))); BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit)); setverdict(pass); diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index d92ea61..a3a50de 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -944,6 +944,18 @@ } } +template PDU_BSSAP ts_BSSMAP_ClassmarkRequest +modifies ts_BSSAP_BSSMAP := { + pdu := { + bssmap := { + classmarkRequest := { + messageType := '58'O, + talkerPriority := omit + } + } + } +} + /* return Layer3 octetstring inside BSSAP PDU */ function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring { if (ischosen(bssap.pdu.bssmap)) { diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 557b1b8..1ce84cf 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -525,6 +525,21 @@ } } +template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := { + discriminator := '0110'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + classmarkEnquiry := { + messageType := '00010011'B, + classmarkEnquiryMask := * + } + } + } +} + template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := { discriminator := '0110'B, tiOrSkip := { -- To view, visit https://gerrit.osmocom.org/11012 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: Idaab4d568cf986b4897ba008f6262c839d1592fb Gerrit-Change-Number: 11012 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr 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 Tue Sep 18 20:33:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:33:09 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 20:33: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 Sep 18 20:33:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:33:10 +0000 Subject: Change in osmo-bsc[master]: Implement RR Classmark Enquiry In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry ...................................................................... Implement RR Classmark Enquiry If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to the MS. (The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC, is already implemented.) Related: OS#3043 (A5/3 encryption) Related: osmo-ttcn3-hacks Idaab4d568cf986b4897ba008f6262c839d1592fb Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 3 files changed, 19 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/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 7b7a62f..e2e861d 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -21,6 +21,7 @@ uint8_t *classmark2_lv); int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, struct msgb *msg, struct bsc_subscr *bsub); +int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 2b4a1ba..35044a3 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -273,6 +273,21 @@ return rsl_siemens_mrpci(lchan, &mrpci); } +/* 3GPP 44.018 9.1.12 Classmark Enquiry */ +int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan) +{ + struct msgb *msg = gsm48_msgb_alloc_name("GSM 44.018 Classmark Enquiry"); + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + + msg->lchan = lchan; + gh->proto_discr = GSM48_PDISC_RR; + gh->msg_type = GSM48_MT_RR_CLSM_ENQ; + + DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan), msgb_length(msg)); + + return gsm48_sendmsg(msg); +} + /* Chapter 9.1.9: Ciphering Mode Command */ int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv) { diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index d6b0b6d..97daa5c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -870,6 +870,9 @@ case BSS_MAP_MSG_HANDOVER_CMD: ret = bssmap_handle_handover_cmd(conn, msg, length); break; + case BSS_MAP_MSG_CLASSMARK_RQST: + ret = gsm48_send_rr_classmark_enquiry(conn->lchan); + break; default: LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n", gsm0808_bssmap_name(msg->l4h[0])); -- To view, visit https://gerrit.osmocom.org/10910 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: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:33:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:33:47 +0000 Subject: Change in osmo-hlr[master]: make: always allow running python tests manually In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11014 ) Change subject: make: always allow running python tests manually ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11014 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: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1 Gerrit-Change-Number: 11014 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:33:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:33:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:33:49 +0000 Subject: Change in osmo-hlr[master]: make: always allow running python tests manually In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11014 ) Change subject: make: always allow running python tests manually ...................................................................... make: always allow running python tests manually Keep the rules to run the external-tests in tests/Makefile available for invocation, to allow conveniently launching the tests manualy without the need to pass --with-external-tests to ./configure first. Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1 --- M tests/Makefile.am 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 7e45da4..e07749c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,6 +44,10 @@ # don't run vty and ctrl tests concurrently so that the ports don't conflict $(MAKE) vty-test $(MAKE) ctrl-test +else +python-tests: + echo "Not running python-based external tests (determined at configure-time)" +endif VTY_TEST_DB = hlr_vty_test.db @@ -75,11 +79,6 @@ -rm -f $(CTRL_TEST_DB) -rm $(CTRL_TEST_DB)-* -else -python-tests: - echo "Not running python-based tests (determined at configure-time)" -endif - check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests -- To view, visit https://gerrit.osmocom.org/11014 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: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1 Gerrit-Change-Number: 11014 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 Tue Sep 18 20:34:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:34:55 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11013 ) Change subject: ttcn3-sgsn-test: save the log as color/raw version ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11013/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11013/1//COMMIT_MSG at 7 PS1, Line 7: as color/raw version I think that's actually overkill. We don't save two log files for any of the other TTCN3 test suites AFAIR either. -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 20:34:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:35:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:35:15 +0000 Subject: Change in osmo-ci[master]: jobs/coverity: only build the master branch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11011 ) Change subject: jobs/coverity: only build the master branch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11011 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: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 Gerrit-Change-Number: 11011 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 18 Sep 2018 20:35: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 Sep 18 20:36:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:36:57 +0000 Subject: Change in osmo-bts[master]: common/rsl.c: tweak log level in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11007 ) Change subject: common/rsl.c: tweak log level in lapdm_rll_tx_cb() ...................................................................... Patch Set 1: Code-Review+1 while at it, it makes sense to msgb_hexdump() which message we're talking about. -- To view, visit https://gerrit.osmocom.org/11007 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: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d Gerrit-Change-Number: 11007 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Sep 2018 20:36:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 20:37:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Sep 2018 20:37:08 +0000 Subject: Change in osmo-bts[master]: CBCH: Some more scheduler_mframe cleanup In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11006 ) Change subject: CBCH: Some more scheduler_mframe cleanup ...................................................................... CBCH: Some more scheduler_mframe cleanup As the CBCH replaces SDCCH sub-slot-2 in downlink, we should mark the uplink as IDLE, just as the associated SACCH in uplink and downlink. Also, there are no burst_numbers in IDLE slots. Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c --- M src/common/scheduler_mframe.c 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c index b78ffa8..b969407 100644 --- a/src/common/scheduler_mframe.c +++ b/src/common/scheduler_mframe.c @@ -179,9 +179,9 @@ { 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_CCCH, 1, TRXC_IDLE, 0 }, + { TRXC_CCCH, 2, TRXC_IDLE, 0 }, + { TRXC_CCCH, 3, TRXC_IDLE, 0 }, { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 }, { TRXC_SCH, 0, TRXC_SACCH4_3, 1 }, { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 }, @@ -219,10 +219,10 @@ { 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_SACCH4_1, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 2, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 3, TRXC_IDLE, 0 }, + { TRXC_IDLE, 0, TRXC_IDLE, 0 }, { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, @@ -267,14 +267,14 @@ { 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_IDLE, 0, TRXC_SDCCH4_1, 2 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 3 }, + { TRXC_IDLE, 0, 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 }, + { TRXC_SACCH4_3, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_3, 2, TRXC_IDLE, 0 }, + { TRXC_SACCH4_3, 3, TRXC_IDLE, 0 }, + { TRXC_IDLE, 0, TRXC_IDLE, 0 }, }; static const struct trx_sched_frame frame_sdcch8[102] = { -- To view, visit https://gerrit.osmocom.org/11006 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: Ib8565d1d0080bfce5d2aec77609709a445a2171c Gerrit-Change-Number: 11006 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 Tue Sep 18 20:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 20:43:42 +0000 Subject: Change in osmo-ci[master]: jobs/coverity: only build the master branch In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11011 ) Change subject: jobs/coverity: only build the master branch ...................................................................... Patch Set 1: Verified-1 the ttcn3 fails because of 3 missing bytes ;) -- To view, visit https://gerrit.osmocom.org/11011 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: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 Gerrit-Change-Number: 11011 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 20:43: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 Sep 18 20:53:55 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 20:53:55 +0000 Subject: Change in osmo-ci[master]: jobs/coverity: only build the master branch In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11011 ) Change subject: jobs/coverity: only build the master branch ...................................................................... Patch Set 1: -Verified -- To view, visit https://gerrit.osmocom.org/11011 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: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 Gerrit-Change-Number: 11011 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 20:53: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 Sep 18 20:54:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 20:54:31 +0000 Subject: Change in osmo-sgsn[master]: vty: restart sgsn state: improve output message In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11018 ) Change subject: vty: restart sgsn state: improve output message ...................................................................... vty: restart sgsn state: improve output message Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7 --- M src/gprs/sgsn_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) 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 154e576..de193f0 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -824,7 +824,7 @@ vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE); gtp_clear_queues(sgsn->gsn); - vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE); + vty_out(vty, "Flushed rx & tx queus towards the GGSN.%s", VTY_NEWLINE); /* remove all queues to bssgp */ return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/11018 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: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7 Gerrit-Change-Number: 11018 Gerrit-PatchSet: 1 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 Sep 18 22:23:25 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 22:23:25 +0000 Subject: Change in osmo-ci[master]: jobs/coverity: only build the master branch In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11011 ) Change subject: jobs/coverity: only build the master branch ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11011 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: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 Gerrit-Change-Number: 11011 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 18 Sep 2018 22:23:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 18 22:23:30 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 22:23:30 +0000 Subject: Change in osmo-ci[master]: jobs/coverity: only build the master branch In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11011 ) Change subject: jobs/coverity: only build the master branch ...................................................................... jobs/coverity: only build the master branch Otherwise the last modified branch will be build. Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 --- M jobs/coverity.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved lynxis lazus: Verified diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 3ec4bda..b37d4a4 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -29,6 +29,8 @@ url: git://git.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' + branches: + - 'origin/master' triggers: - timed: "@daily" -- To view, visit https://gerrit.osmocom.org/11011 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: I0b68ebae025e0dc9dbfd22b97731b59be30e7823 Gerrit-Change-Number: 11011 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 Sep 18 22:37:47 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 18 Sep 2018 22:37:47 +0000 Subject: Change in osmo-ci[master]: coverity: don't install systemd file In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11017 to look at the new patch set (#2). Change subject: coverity: don't install systemd file ...................................................................... coverity: don't install systemd file Because the systemd install directory does not use --prefix as base, they are installed by default to /lib/systemd. As the coverity only scans the compilation, don't install systemd files. Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/11017/2 -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 06:31:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Sep 2018 06:31:06 +0000 Subject: Change in osmo-bts[master]: common/rsl.c: tweak log message in lapdm_rll_tx_cb() 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/11007 to look at the new patch set (#2). Change subject: common/rsl.c: tweak log message in lapdm_rll_tx_cb() ...................................................................... common/rsl.c: tweak log message in lapdm_rll_tx_cb() During the investigation of OS#3559, it was discovered that the log message, which warns that an RSL message was dropped due to inactive logical channel, has incorrect log level - LOGL_INFO. This is not informative kind of message, so let's increase the log level, and additionally let's print the hexdump of message and it's length. Change-Id: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d --- M src/common/rsl.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/11007/2 -- To view, visit https://gerrit.osmocom.org/11007 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: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d Gerrit-Change-Number: 11007 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 19 08:14:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 08:14:22 +0000 Subject: Change in osmo-bts[master]: common/rsl.c: tweak log message in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11007 ) Change subject: common/rsl.c: tweak log message in lapdm_rll_tx_cb() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11007 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: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d Gerrit-Change-Number: 11007 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Sep 2018 08:14: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 Sep 19 08:14:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 08:14:23 +0000 Subject: Change in osmo-bts[master]: common/rsl.c: tweak log message in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11007 ) Change subject: common/rsl.c: tweak log message in lapdm_rll_tx_cb() ...................................................................... common/rsl.c: tweak log message in lapdm_rll_tx_cb() During the investigation of OS#3559, it was discovered that the log message, which warns that an RSL message was dropped due to inactive logical channel, has incorrect log level - LOGL_INFO. This is not informative kind of message, so let's increase the log level, and additionally let's print the hexdump of message and it's length. Change-Id: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d --- M src/common/rsl.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 2aa7f4d..601b1c1 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2671,8 +2671,9 @@ rh = msgb_l2(msg); if (lchan->state != LCHAN_S_ACTIVE) { - LOGP(DRSL, LOGL_INFO, "%s(%s) is not active . Dropping message.\n", - gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); + LOGP(DRSL, LOGL_ERROR, "%s(%s) is not active. Dropping message (len=%u): %s\n", + gsm_lchan_name(lchan), gsm_lchans_name(lchan->state), + msgb_l2len(msg), msgb_hexdump_l2(msg)); msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/11007 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: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d Gerrit-Change-Number: 11007 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 19 08:15:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 08:15:32 +0000 Subject: Change in osmo-ci[master]: coverity: don't install systemd file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: don't install systemd file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 08:15: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 Sep 19 09:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 09:43:28 +0000 Subject: Change in osmo-sgsn[master]: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11020 ) Change subject: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11020 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: I507a8c2193c84f8dff7f5d669adcd3583331f289 Gerrit-Change-Number: 11020 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 09:43: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 Sep 19 09:44:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 09:44:42 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11021 ) Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11021/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/11021/1/include/osmocom/sgsn/gprs_sgsn.h at 179 PS1, Line 179: int auth_reattempt; /* tracking UMTS resync auth attempts */ it's actually an unsigned int. -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 09:44:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 09:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 09:48:59 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11021 ) Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11021/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/11021/1/include/osmocom/sgsn/gprs_sgsn.h at 179 PS1, Line 179: int auth_reattempt; /* tracking UMTS resync auth attempts */ > it's actually an unsigned int. yes, but it will hold only values from 0 - 2. -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 09:48:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 09:51:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 09:51:54 +0000 Subject: Change in osmo-ci[master]: coverity: don't install systemd file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: don't install systemd file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 09:51: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 Sep 19 09:53:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 09:53:36 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11021 ) Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11021/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/11021/1/include/osmocom/sgsn/gprs_sgsn.h at 179 PS1, Line 179: int auth_reattempt; /* tracking UMTS resync auth attempts */ > yes, but it will hold only values from 0 - 2. Then the range is that of an unsigned, and imho it's clearer just by looking at this line that no negative values are going to be used, no need to go check the code if some special values like -1 are being used. -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 09:53:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 09:57:30 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 09:57:30 +0000 Subject: Change in osmo-ci[master]: coverity: don't install systemd file In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: don't install systemd file ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 09:57:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 09:57:40 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 09:57:40 +0000 Subject: Change in osmo-ci[master]: coverity: don't install systemd file In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11017 ) Change subject: coverity: don't install systemd file ...................................................................... coverity: don't install systemd file Because the systemd install directory does not use --prefix as base, they are installed by default to /lib/systemd. As the coverity only scans the compilation, don't install systemd files. Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved lynxis lazus: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 920c0b9..86bb569 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -12,7 +12,7 @@ do_build() { autoreconf --install --force - ./configure --prefix="$prefix" $* + ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $* make $PARALLEL_MAKE make install -- To view, visit https://gerrit.osmocom.org/11017 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: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde Gerrit-Change-Number: 11017 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 10:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 10:10:37 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts 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/11021 to look at the new patch set (#2). Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... gprs_sgsn.h: fix wrong type of re-attempts The GMM ctx->gmm_att_req.auth_reattempt is used to track multiple UTMS re-sync attempt of a MS. Change-Id: I708226cec9e131dcda4234f42ed3689f4f6750e8 Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM") Fixes: OS#3556 --- M include/osmocom/sgsn/gprs_sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/21/11021/2 -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 10:18:00 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 10:18:00 +0000 Subject: Change in osmo-sgsn[master]: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11020 ) Change subject: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone ...................................................................... sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone When the GGSN crashs, the SGSN will be notified after it comes back. Because of the async operation, the mm ctx could be already gone. Change-Id: I507a8c2193c84f8dff7f5d669adcd3583331f289 --- M src/gprs/gprs_sgsn.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 977ae48..dc0e7c0 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -707,7 +707,9 @@ void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx) { - if (pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) { + /* the MM context can be deleted while the GGSN is not reachable or + * if has been crashed. */ + if (pctx->mm && pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) { gsm48_tx_gsm_deact_pdp_req(pctx, GSM_CAUSE_NET_FAIL, true); sgsn_ggsn_ctx_remove_pdp(pctx->ggsn, pctx); } else { -- To view, visit https://gerrit.osmocom.org/11020 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: I507a8c2193c84f8dff7f5d669adcd3583331f289 Gerrit-Change-Number: 11020 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 10:23:53 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 10:23:53 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11013 to look at the new patch set (#2). Change subject: ttcn3-sgsn-test: save the log as color/raw version ...................................................................... ttcn3-sgsn-test: save the log as color/raw version The sgsn does not save anywhere it's logfile. Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 --- M ttcn3-sgsn-test/osmo-sgsn.cfg 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/11013/2 -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 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 Wed Sep 19 10:24:27 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 10:24:27 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log file to appear in the artifacts. In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11013 to look at the new patch set (#3). Change subject: ttcn3-sgsn-test: save the log file to appear in the artifacts. ...................................................................... ttcn3-sgsn-test: save the log file to appear in the artifacts. The sgsn does not save anywhere it's logfile. Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 --- M ttcn3-sgsn-test/osmo-sgsn.cfg 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/11013/3 -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 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 Wed Sep 19 10:29:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 10:29:17 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11021 ) Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 10:29: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 Sep 19 10:31:02 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 10:31:02 +0000 Subject: Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11021 ) Change subject: gprs_sgsn.h: fix wrong type of re-attempts ...................................................................... gprs_sgsn.h: fix wrong type of re-attempts The GMM ctx->gmm_att_req.auth_reattempt is used to track multiple UTMS re-sync attempt of a MS. Change-Id: I708226cec9e131dcda4234f42ed3689f4f6750e8 Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM") Fixes: OS#3556 --- M include/osmocom/sgsn/gprs_sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index a5ca959..2fbc0b6 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -176,7 +176,7 @@ * the fsm needs to compare it against old to decide what to do */ struct msgb *attach_req; uint32_t id_type; - bool auth_reattempt; + unsigned int auth_reattempt; /* tracking UMTS resync auth attempts */ } gmm_att_req; /* VLR number */ uint32_t new_sgsn_addr; -- To view, visit https://gerrit.osmocom.org/11021 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: I708226cec9e131dcda4234f42ed3689f4f6750e8 Gerrit-Change-Number: 11021 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 10:39:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 10:39:57 +0000 Subject: Change in osmo-gsm-tester[master]: encryption: Reuse code using test lib features In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11009 ) Change subject: encryption: Reuse code using test lib features ...................................................................... encryption: Reuse code using test lib features Change-Id: I9b6944516c524a0c11a47aec6839f8ee9d571661 --- A suites/encryption/lib/testlib.py M suites/encryption/register_a5_0_authopt.py M suites/encryption/register_a5_0_authreq.py M suites/encryption/register_a5_1_authreq.py 4 files changed, 66 insertions(+), 125 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/encryption/lib/testlib.py b/suites/encryption/lib/testlib.py new file mode 100644 index 0000000..3948941 --- /dev/null +++ b/suites/encryption/lib/testlib.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def encryption_test_setup_run(enable_auth, algo): + 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 = suite.modem() + + print('start network...') + msc.set_authentication(enable_auth) + msc.set_encryption(algo) + bsc.set_encryption(algo) + 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) + + ms.log_info() + good_ki = ms.ki() + bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] + + print('KI changed: ' + good_ki + " => " + bad_ki) + ms.set_ki(bad_ki) + hlr.subscriber_add(ms) + if enable_auth: + print('Attempt connection with wrong KI...') + ms.connect(msc.mcc_mnc()) + + sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) + print('Asserting modem did not register') + # FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 + # assert not ms.is_connected(msc.mcc_mnc()) + assert not msc.subscriber_attached(ms) + + hlr.subscriber_delete(ms) + print('KI changed: ' + bad_ki + " => " + good_ki) + ms.set_ki(good_ki) + hlr.subscriber_add(ms, ms.msisdn) + print('Attempt connection with correct KI...') + else: + print('Attempt connection with wrong KI, should work as it is not used...') + ms.connect(msc.mcc_mnc()) + wait(ms.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms) diff --git a/suites/encryption/register_a5_0_authopt.py b/suites/encryption/register_a5_0_authopt.py index acbbb1f..1b7f471 100755 --- a/suites/encryption/register_a5_0_authopt.py +++ b/suites/encryption/register_a5_0_authopt.py @@ -1,37 +1,8 @@ #!/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 = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run -print('start network...') -msc.set_authentication(False) -msc.set_encryption('a5_0') -bsc.set_encryption('a5_0') -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) - -ms.log_info() -good_ki = ms.ki() -bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] - -print('KI changed: ' + good_ki + " => " + bad_ki) -ms.set_ki(bad_ki) -hlr.subscriber_add(ms) -print('Attempt connection with wrong KI, should work as it is not used...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +encryption_test_setup_run(False, 'a5_0') diff --git a/suites/encryption/register_a5_0_authreq.py b/suites/encryption/register_a5_0_authreq.py index 789ace5..feca525 100755 --- a/suites/encryption/register_a5_0_authreq.py +++ b/suites/encryption/register_a5_0_authreq.py @@ -1,50 +1,8 @@ #!/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 = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run -print('start network...') -msc.set_authentication(True) -msc.set_encryption('a5_0') -bsc.set_encryption('a5_0') -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) - -ms.log_info() -good_ki = ms.ki() -bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] - -print('KI changed: ' + good_ki + " => " + bad_ki) -ms.set_ki(bad_ki) -hlr.subscriber_add(ms) -print('Attempt connection with wrong KI...') -ms.connect(msc.mcc_mnc()) - -sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) -print('Asserting modem did not register') -# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 -# assert not ms.is_connected(msc.mcc_mnc()) -assert not msc.subscriber_attached(ms) - -hlr.subscriber_delete(ms) -print('KI changed: ' + bad_ki + " => " + good_ki) -ms.set_ki(good_ki) -hlr.subscriber_add(ms, ms.msisdn) -print('Attempt connection with correct KI...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +encryption_test_setup_run(True, 'a5_0') diff --git a/suites/encryption/register_a5_1_authreq.py b/suites/encryption/register_a5_1_authreq.py index e7aa76c..077819b 100755 --- a/suites/encryption/register_a5_1_authreq.py +++ b/suites/encryption/register_a5_1_authreq.py @@ -1,50 +1,8 @@ #!/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 = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run -print('start network...') -msc.set_authentication(True) -msc.set_encryption('a5_1') -bsc.set_encryption('a5_1') -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) - -ms.log_info() -good_ki = ms.ki() -bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:] - -print('KI changed: ' + good_ki + " => " + bad_ki) -ms.set_ki(bad_ki) -hlr.subscriber_add(ms) -print('Attempt connection with wrong KI...') -ms.connect(msc.mcc_mnc()) - -sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) -print('Asserting modem did not register') -# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 -# assert not ms.is_connected(msc.mcc_mnc()) -assert not msc.subscriber_attached(ms) - -hlr.subscriber_delete(ms) -print('KI changed: ' + bad_ki + " => " + good_ki) -ms.set_ki(good_ki) -hlr.subscriber_add(ms, ms.msisdn) -print('Attempt connection with correct KI...') -ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) +encryption_test_setup_run(True, 'a5_1') -- To view, visit https://gerrit.osmocom.org/11009 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: I9b6944516c524a0c11a47aec6839f8ee9d571661 Gerrit-Change-Number: 11009 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 Sep 19 10:46:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 10:46:54 +0000 Subject: Change in osmo-mgw[master]: mgcp: Fix osmux_cid_bitmap static array size calculation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10995 ) Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation ...................................................................... mgcp: Fix osmux_cid_bitmap static array size calculation Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is 256 which fits array boundaries correctly (multiple of 8). However, if for example OSMUX_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd have an undesired memory access when accessing last 4 CIDs. A +1 should be kept on top, because OSMUX_CID_MAX specified the maximum number used by a CID, that is (0,OSMUX_CID_MAX), and as a result we require OSMUX_CID_MAX+1 slots. Change-Id: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 26817c8..5d16826 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -655,8 +655,8 @@ htons(endp->cfg->osmux_port), buf, sizeof(buf)); } -/*! bsc-nat allocates/releases the OSMUX cids (Circuit IDs). */ -static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8]; +/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */ +static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8]; /*! count the number of taken OSMUX cids. * \returns number of OSMUX cids in use */ -- To view, visit https://gerrit.osmocom.org/10995 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: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c Gerrit-Change-Number: 10995 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 Sep 19 10:46:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 10:46:54 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10998 ) Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen ...................................................................... mgcp_osmux: Use define to calculate rtp_ssrc_winlen Since that define is already used to allocate size of osmux_cid_bitmap, let's use it here too instead of hardcoding its value. Change-Id: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 5d16826..f842232 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -515,12 +515,12 @@ * used to reconstruct the RTP flow from osmux. The RTP SSRC is * allocated based on the circuit ID (conn_net->osmux.cid), which is unique * in the local scope to the BSC/BSC-NAT. We use it to divide the RTP - * SSRC space (2^32) by the 256 possible circuit IDs, then randomly + * SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, then randomly * select one value from that window. Thus, we have no chance to have * overlapping RTP SSRC traveling to the BTSes behind the BSC, * similarly, for flows traveling to the MSC. */ - static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256; + static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); uint16_t osmux_dummy = endp->cfg->osmux_dummy; /* Check if osmux is enabled for the specified connection */ -- To view, visit https://gerrit.osmocom.org/10998 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: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb Gerrit-Change-Number: 10998 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 Wed Sep 19 11:41:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Sep 2018 11:41:26 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11024 Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... gsm0808: add function to convert amr gsm0408 setings to gsm0808 Add a function to convert struct gsm48_multi_rate_conf, which holds the codec settings for AMR, to S0-S15 bit representation as defined in 3GPP TS 48.008 3.2.2.49 Change-Id: Ia782e21c206c15e840226d79b4209d13658ee916 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 482 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/11024/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 242bce9..0a7429e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,6 +104,7 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 9433817..8431ace 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -503,6 +503,20 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; +/*! Default speech codec configurations broken down by reate. + * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for + * the Adaptive Multi-Rate Codec Types. */ +enum gsm0808_speech_codec_rate_defaults { + GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, + GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, + GSM0808_SC_CFG_DEFAULT_AMR_5_90 = 0xff06, + GSM0808_SC_CFG_DEFAULT_AMR_6_70 = 0x3e08, + GSM0808_SC_CFG_DEFAULT_AMR_7_40 = 0x0c12, + GSM0808_SC_CFG_DEFAULT_AMR_7_95 = 0xc020, + GSM0808_SC_CFG_DEFAULT_AMR_10_2 = 0x3040, + GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 +}; + /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 73f0234..4b2a5f5 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1161,6 +1161,49 @@ return 0; } +/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a + * given GSM 04.08 AMR configuration struct. + * \param[in] cfg AMR configuration in GSM 04.08 format. + * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. + * \returns configuration bits (S0-S15) */ +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, + bool fr) +{ + uint16_t s15_s0 = 0; + + /* Check each rate bit in the AMR multirate configuration and pick the + * matching default configuration as specified in 3GPP TS 28.062, + * Table 7.11.3.1.3-2. */ + if (cfg->m4_75) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_4_75; + if (cfg->m5_15) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_15; + if (cfg->m5_90) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_90; + if (cfg->m6_70) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_6_70; + if (cfg->m7_40) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_40; + if (cfg->m7_95) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_95; + if (cfg->m10_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_10_2; + if (cfg->m12_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_12_2; + + /* Note: 3GPP TS 48.008, chapter 3GPP TS 48.008 states that for AMR + * some of the configuration bits must be coded as zeros. The applied + * bitmask matches the default codec settings. See also the definition + * of enum gsm0808_speech_codec_defaults in gsm_08_08.h and + * 3GPP TS 28.062, Table 7.11.3.1.3-2. */ + if (fr) + s15_s0 &= GSM0808_SC_CFG_DEFAULT_FR_AMR; + else + s15_s0 &= GSM0808_SC_CFG_DEFAULT_HR_AMR; + + return s15_s0; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 0c40c88..3d08232 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -205,6 +205,7 @@ gsm0808_cell_id_u_name; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; +gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index ae138be..6faa689 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1444,6 +1444,202 @@ msgb_free(msg); } +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) +{ + uint16_t s15_s0; + + printf("Input:\n"); + printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); + printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); + printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); + printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); + printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); + printf(" m7_95= %u\n", cfg->m7_95); + printf(" m10_2= %u\n", cfg->m10_2); + printf(" m12_2= %u\n", cfg->m12_2); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); + printf("Result (fr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); + printf("Result (hr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + printf("\n"); +} + +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg(void) +{ + struct gsm48_multi_rate_conf cfg; + + printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); + + memset(&cfg, 0, sizeof(cfg)); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1495,6 +1691,8 @@ test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); + test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); + printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 6cd7982..dc1deba 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -74,4 +74,229 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) +Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5703 = 0b0101011100000011 +Result (hr): + S15-S0 = 0703 = 0b0000011100000011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5706 = 0b0101011100000110 +Result (hr): + S15-S0 = 0706 = 0b0000011100000110 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 1608 = 0b0001011000001000 +Result (hr): + S15-S0 = 0608 = 0b0000011000001000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0412 = 0b0000010000010010 +Result (hr): + S15-S0 = 0412 = 0b0000010000010010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 4020 = 0b0100000000100000 +Result (hr): + S15-S0 = 0020 = 0b0000000000100000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 1040 = 0b0001000001000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 4082 = 0b0100000010000010 +Result (hr): + S15-S0 = 0002 = 0b0000000000000010 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 570f = 0b0101011100001111 +Result (hr): + S15-S0 = 070f = 0b0000011100001111 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 54f2 = 0b0101010011110010 +Result (hr): + S15-S0 = 0432 = 0b0000010000110010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ce = 0b0101011111001110 +Result (hr): + S15-S0 = 070e = 0b0000011100001110 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5733 = 0b0101011100110011 +Result (hr): + S15-S0 = 0733 = 0b0000011100110011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 56aa = 0b0101011010101010 +Result (hr): + S15-S0 = 062a = 0b0000011000101010 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 5757 = 0b0101011101010111 +Result (hr): + S15-S0 = 0717 = 0b0000011100010111 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ff = 0b0101011111111111 +Result (hr): + S15-S0 = 073f = 0b0000011100111111 + Done -- To view, visit https://gerrit.osmocom.org/11024 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: Ia782e21c206c15e840226d79b4209d13658ee916 Gerrit-Change-Number: 11024 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 11:55:59 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Sep 2018 11:55:59 +0000 Subject: Change in pysim[master]: test Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11025 Change subject: test ...................................................................... test Change-Id: I807ebd6c08b758dd7ab24e53531ea5ec00eaca43 --- A testme.txt 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/11025/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/11025 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: I807ebd6c08b758dd7ab24e53531ea5ec00eaca43 Gerrit-Change-Number: 11025 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 12:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Sep 2018 12:04:15 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11025 ) Change subject: test ...................................................................... Abandoned test -- To view, visit https://gerrit.osmocom.org/11025 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: I807ebd6c08b758dd7ab24e53531ea5ec00eaca43 Gerrit-Change-Number: 11025 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 12:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 12:06:02 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add jenkins-build-osmo-iuh.sh Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11026 Change subject: contrib: Add jenkins-build-osmo-iuh.sh ...................................................................... contrib: Add jenkins-build-osmo-iuh.sh Change-Id: I75cb9551db6b1b4aa5bfb76177694c14fad82f04 --- A contrib/jenkins-build-osmo-iuh.sh 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/26/11026/1 diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-iuh.sh new file mode 100755 index 0000000..03295f9 --- /dev/null +++ b/contrib/jenkins-build-osmo-iuh.sh @@ -0,0 +1,15 @@ +#!/bin/sh +set -e -x +base="$PWD" +name="osmo-iuh" +. "$(dirname "$0")/jenkins-build-common.sh" + +build_repo libosmocore --enable-sanitize --disable-doxygen +build_repo libosmo-abis --enable-sanitize +build_repo libosmo-netif --enable-sanitize --disable-doxygen +build_repo libosmo-sccp --enable-sanitize +build_repo libasn1c --enable-sanitize + +build_repo osmo-iuh --enable-sanitize + +create_bin_tgz "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/11026 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: I75cb9551db6b1b4aa5bfb76177694c14fad82f04 Gerrit-Change-Number: 11026 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 Sep 19 12:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 12:06:03 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Build osmo-msc with IU support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11027 Change subject: contrib: Build osmo-msc with IU support ...................................................................... contrib: Build osmo-msc with IU support Change-Id: I68503ae2f27948aff60a9424e6b114db548d79e9 --- M contrib/jenkins-build-osmo-msc.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/27/11027/1 diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index 5b5d1f6..b614052 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -11,6 +11,8 @@ 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 +build_repo libasn1c --enable-sanitize +build_repo osmo-iuh --enable-sanitize +build_repo osmo-msc --enable-sanitize --enable-smpp --enable-iu create_bin_tgz osmo-msc -- To view, visit https://gerrit.osmocom.org/11027 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: I68503ae2f27948aff60a9424e6b114db548d79e9 Gerrit-Change-Number: 11027 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 Sep 19 12:06:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 12:06:06 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Build osmo-sgsn with IU support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11028 Change subject: contrib: Build osmo-sgsn with IU support ...................................................................... contrib: Build osmo-sgsn with IU support Change-Id: I810ae848c350550430c1918b3abb4376d21d7317 --- M contrib/jenkins-build-osmo-sgsn.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/28/11028/1 diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index 4a23b33..87aed76 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -9,6 +9,8 @@ build_repo libosmo-netif --enable-sanitize --disable-doxygen build_repo libosmo-sccp --enable-sanitize build_repo osmo-ggsn --enable-sanitize -build_repo osmo-sgsn --enable-sanitize --disable-iu +build_repo libasn1c --enable-sanitize +build_repo osmo-iuh --enable-sanitize +build_repo osmo-sgsn --enable-sanitize --enable-iu create_bin_tgz osmo-sgsn -- To view, visit https://gerrit.osmocom.org/11028 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: I810ae848c350550430c1918b3abb4376d21d7317 Gerrit-Change-Number: 11028 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 Sep 19 12:35:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 12:35:52 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Add osmo-iuh builds Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11029 Change subject: jobs: osmo-gsm-tester: Add osmo-iuh builds ...................................................................... jobs: osmo-gsm-tester: Add osmo-iuh builds Change-Id: I7b8f51597287e7673f79c65eae2508b074151781 --- M jobs/osmo-gsm-tester-builder.yml M jobs/osmo-gsm-tester-runner.yml 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/11029/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 748062d..1b522fc 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -11,6 +11,7 @@ - osmo-ggsn - osmo-hlr - osmo-mgw + - osmo-iuh - osmo-msc - osmo-pcu - osmo-sgsn @@ -81,6 +82,10 @@ - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_bsc - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_libasn1c + - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmo_iuh + - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_msc - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_hlr diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index f6774b7..a45d428 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -62,6 +62,8 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmo-mgw - copy_artifact: + repo: osmo-gsm-tester_build-osmo-iuh + - copy_artifact: repo: osmo-gsm-tester_build-osmo-msc - copy_artifact: repo: osmo-gsm-tester_build-osmo-pcu -- To view, visit https://gerrit.osmocom.org/11029 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: I7b8f51597287e7673f79c65eae2508b074151781 Gerrit-Change-Number: 11029 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 Sep 19 12:35:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 12:35:52 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11030 Change subject: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact ...................................................................... jobs: osmo-gsm-tester: Copy osmocom-bb build artifact This artifact is not needed nowadays to run current tests in those jobs, since it is only used in osmo-gsm-tester_ttcn3, but it will eventually be used once we support virtphy and/or motorola phones in usual tests, and also because it's easier for developers to download full .tar.gz with all at once instead of having to download osmocom-bb one separately whn whilling to run ttcn3 testsuite locally. Change-Id: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/30/11030/1 diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index a45d428..8f7cd03 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -76,6 +76,8 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmo-stp - copy_artifact: + repo: osmo-gsm-tester_build-osmocom-bb + - copy_artifact: repo: osmo-gsm-tester_build-osmo-bts-sysmo - copy_artifact: repo: osmo-gsm-tester_build-osmo-pcu-sysmo -- To view, visit https://gerrit.osmocom.org/11030 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: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 Gerrit-Change-Number: 11030 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 Sep 19 13:00:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Sep 2018 13:00:57 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: Ok, so we can merge as soon as there is a CR+2 and a V+1 vote. Normally we have some or other jenkins job to give the V+1, but since there is none here, you can cast your own V+1 vote == indicate that you verified that it works, and merge as soon as you think it's ready. -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Sep 2018 13:00: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 Sep 19 13:27:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 13:27:14 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: > Ok, so we can merge as soon as there is a CR+2 and a V+1 vote. > Normally we have some or other jenkins job to give the V+1, but > since there is none here, you can cast your own V+1 vote == > indicate that you verified that it works, and merge as soon as you > think it's ready. No merge yet since I think some stuff is still being prepared. Better mark is as WIP meanwhile. -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 13:27:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 13:31:40 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 13:31:40 +0000 Subject: Change in osmo-sgsn[master]: GTP: refactor the echo timer In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11023 ) Change subject: GTP: refactor the echo timer ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11023 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: Ia33471a9a9cfc3887facb665c82094b99932052a Gerrit-Change-Number: 11023 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 13:31: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 Sep 19 13:31:42 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 19 Sep 2018 13:31:42 +0000 Subject: Change in osmo-sgsn[master]: GTP: refactor the echo timer In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11023 ) Change subject: GTP: refactor the echo timer ...................................................................... GTP: refactor the echo timer Move the check of the echo timer into an own function. The gtp echo timer must be re-check everytime the echo-timer has been modified or deactivated via vty. Fixes the TTCN3 SGSN_Tests.TC_attach_restart_ctr_echo Change-Id: Ia33471a9a9cfc3887facb665c82094b99932052a --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c 3 files changed, 17 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 2fbc0b6..1913591 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -375,6 +375,7 @@ int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct sgsn_pdp_ctx *except); void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); +void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc); struct apn_ctx { struct llist_head list; diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index dc0e7c0..efbae22 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -489,6 +489,17 @@ talloc_free(pdp); } +void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc) +{ + if (llist_empty(&ggc->pdp_list) || ggc->echo_interval <= 0) { + if (osmo_timer_pending(&ggc->echo_timer)) + osmo_timer_del(&ggc->echo_timer); + } else { + if (!osmo_timer_pending(&ggc->echo_timer)) + osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); + } +} + /* GGSN contexts */ static void echo_timer_cb(void *data) { @@ -742,15 +753,14 @@ void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp) { - if (llist_empty(&ggc->pdp_list) && ggc->echo_interval > 0) - osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); + sgsn_ggsn_ctx_check_echo_timer(ggc); + llist_add(&pdp->ggsn_list, &ggc->pdp_list); } void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp) { llist_del(&pdp->ggsn_list); - if (llist_empty(&ggc->pdp_list) && osmo_timer_pending(&ggc->echo_timer)) - osmo_timer_del(&ggc->echo_timer); + sgsn_ggsn_ctx_check_echo_timer(ggc); if (pdp->destroy_ggsn) sgsn_ggsn_ctx_free(pdp->ggsn); pdp->ggsn = NULL; diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index de193f0..63985bc 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -383,6 +383,7 @@ "not be lower than 60 seconds, use this value for " \ "testing purposes only!%s", VTY_NEWLINE); + sgsn_ggsn_ctx_check_echo_timer(ggc); return CMD_SUCCESS; } @@ -395,6 +396,7 @@ struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id); ggc->echo_interval = -1; + sgsn_ggsn_ctx_check_echo_timer(ggc); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/11023 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: Ia33471a9a9cfc3887facb665c82094b99932052a Gerrit-Change-Number: 11023 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:01:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Sep 2018 14:01:16 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/11024 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... gsm0808: add function to convert amr gsm0408 setings to gsm0808 Add a function to convert struct gsm48_multi_rate_conf, which holds the codec settings for AMR, to S0-S15 bit representation as defined in 3GPP TS 48.008 3.2.2.49 This resurrects change-id I4e656731b16621736c7a2f4e64d9ce63b1064e98 which was reverted in I9e0d405e303ed86d23703ca6362e958dddb2f861 due to gsm0808_test failing. The test failure is fixed by properly clearing the struct gsm48_multirate_cfg prior to running tests (add memset(0)). Change-Id: Ia782e21c206c15e840226d79b4209d13658ee916 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 482 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/11024/2 -- To view, visit https://gerrit.osmocom.org/11024 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: Ia782e21c206c15e840226d79b4209d13658ee916 Gerrit-Change-Number: 11024 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 Wed Sep 19 14:02:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Sep 2018 14:02:40 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11024 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... Patch Set 2: Verified+1 Code-Review+2 I tweaked the commit log to indicate this patch's history, which you should obviously have included. -- To view, visit https://gerrit.osmocom.org/11024 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: Ia782e21c206c15e840226d79b4209d13658ee916 Gerrit-Change-Number: 11024 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 19 Sep 2018 14:02: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 Sep 19 14:03:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Sep 2018 14:03:03 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert amr gsm0408 setings to gsm0808 In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11024 ) Change subject: gsm0808: add function to convert amr gsm0408 setings to gsm0808 ...................................................................... gsm0808: add function to convert amr gsm0408 setings to gsm0808 Add a function to convert struct gsm48_multi_rate_conf, which holds the codec settings for AMR, to S0-S15 bit representation as defined in 3GPP TS 48.008 3.2.2.49 This resurrects change-id I4e656731b16621736c7a2f4e64d9ce63b1064e98 which was reverted in I9e0d405e303ed86d23703ca6362e958dddb2f861 due to gsm0808_test failing. The test failure is fixed by properly clearing the struct gsm48_multirate_cfg prior to running tests (add memset(0)). Change-Id: Ia782e21c206c15e840226d79b4209d13658ee916 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 482 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 242bce9..0a7429e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,6 +104,7 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 9433817..8431ace 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -503,6 +503,20 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; +/*! Default speech codec configurations broken down by reate. + * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for + * the Adaptive Multi-Rate Codec Types. */ +enum gsm0808_speech_codec_rate_defaults { + GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, + GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, + GSM0808_SC_CFG_DEFAULT_AMR_5_90 = 0xff06, + GSM0808_SC_CFG_DEFAULT_AMR_6_70 = 0x3e08, + GSM0808_SC_CFG_DEFAULT_AMR_7_40 = 0x0c12, + GSM0808_SC_CFG_DEFAULT_AMR_7_95 = 0xc020, + GSM0808_SC_CFG_DEFAULT_AMR_10_2 = 0x3040, + GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 +}; + /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 73f0234..4b2a5f5 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1161,6 +1161,49 @@ return 0; } +/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a + * given GSM 04.08 AMR configuration struct. + * \param[in] cfg AMR configuration in GSM 04.08 format. + * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. + * \returns configuration bits (S0-S15) */ +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, + bool fr) +{ + uint16_t s15_s0 = 0; + + /* Check each rate bit in the AMR multirate configuration and pick the + * matching default configuration as specified in 3GPP TS 28.062, + * Table 7.11.3.1.3-2. */ + if (cfg->m4_75) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_4_75; + if (cfg->m5_15) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_15; + if (cfg->m5_90) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_5_90; + if (cfg->m6_70) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_6_70; + if (cfg->m7_40) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_40; + if (cfg->m7_95) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_7_95; + if (cfg->m10_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_10_2; + if (cfg->m12_2) + s15_s0 |= GSM0808_SC_CFG_DEFAULT_AMR_12_2; + + /* Note: 3GPP TS 48.008, chapter 3GPP TS 48.008 states that for AMR + * some of the configuration bits must be coded as zeros. The applied + * bitmask matches the default codec settings. See also the definition + * of enum gsm0808_speech_codec_defaults in gsm_08_08.h and + * 3GPP TS 28.062, Table 7.11.3.1.3-2. */ + if (fr) + s15_s0 &= GSM0808_SC_CFG_DEFAULT_FR_AMR; + else + s15_s0 &= GSM0808_SC_CFG_DEFAULT_HR_AMR; + + return s15_s0; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 0c40c88..3d08232 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -205,6 +205,7 @@ gsm0808_cell_id_u_name; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; +gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index ae138be..6faa689 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1444,6 +1444,202 @@ msgb_free(msg); } +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) +{ + uint16_t s15_s0; + + printf("Input:\n"); + printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); + printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); + printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); + printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); + printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); + printf(" m7_95= %u\n", cfg->m7_95); + printf(" m10_2= %u\n", cfg->m10_2); + printf(" m12_2= %u\n", cfg->m12_2); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); + printf("Result (fr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); + printf("Result (hr):\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + printf("\n"); +} + +static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg(void) +{ + struct gsm48_multi_rate_conf cfg; + + printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); + + memset(&cfg, 0, sizeof(cfg)); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 0; + cfg.m5_15 = 1; + cfg.m5_90 = 0; + cfg.m6_70 = 1; + cfg.m7_40 = 0; + cfg.m7_95 = 1; + cfg.m10_2 = 0; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 0; + cfg.m5_90 = 1; + cfg.m6_70 = 0; + cfg.m7_40 = 1; + cfg.m7_95 = 0; + cfg.m10_2 = 1; + cfg.m12_2 = 0; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); + + cfg.m4_75 = 1; + cfg.m5_15 = 1; + cfg.m5_90 = 1; + cfg.m6_70 = 1; + cfg.m7_40 = 1; + cfg.m7_95 = 1; + cfg.m10_2 = 1; + cfg.m12_2 = 1; + test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1495,6 +1691,8 @@ test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); + test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); + printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 6cd7982..dc1deba 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -74,4 +74,229 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) +Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5703 = 0b0101011100000011 +Result (hr): + S15-S0 = 0703 = 0b0000011100000011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0000 = 0b0000000000000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5706 = 0b0101011100000110 +Result (hr): + S15-S0 = 0706 = 0b0000011100000110 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 1608 = 0b0001011000001000 +Result (hr): + S15-S0 = 0608 = 0b0000011000001000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 0412 = 0b0000010000010010 +Result (hr): + S15-S0 = 0412 = 0b0000010000010010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 4020 = 0b0100000000100000 +Result (hr): + S15-S0 = 0020 = 0b0000000000100000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 1040 = 0b0001000001000000 +Result (hr): + S15-S0 = 0000 = 0b0000000000000000 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 4082 = 0b0100000010000010 +Result (hr): + S15-S0 = 0002 = 0b0000000000000010 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 570f = 0b0101011100001111 +Result (hr): + S15-S0 = 070f = 0b0000011100001111 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 54f2 = 0b0101010011110010 +Result (hr): + S15-S0 = 0432 = 0b0000010000110010 + +Input: + m4_75= 0 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ce = 0b0101011111001110 +Result (hr): + S15-S0 = 070e = 0b0000011100001110 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 0 +Result (fr): + S15-S0 = 5733 = 0b0101011100110011 +Result (hr): + S15-S0 = 0733 = 0b0000011100110011 + +Input: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 0 + m7_95= 1 + m10_2= 0 + m12_2= 1 +Result (fr): + S15-S0 = 56aa = 0b0101011010101010 +Result (hr): + S15-S0 = 062a = 0b0000011000101010 + +Input: + m4_75= 1 smod= 0 + m5_15= 0 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 0 + m10_2= 1 + m12_2= 0 +Result (fr): + S15-S0 = 5757 = 0b0101011101010111 +Result (hr): + S15-S0 = 0717 = 0b0000011100010111 + +Input: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 0 + m6_70= 1 nscb= 0 + m7_40= 1 ver= 0 + m7_95= 1 + m10_2= 1 + m12_2= 1 +Result (fr): + S15-S0 = 57ff = 0b0101011111111111 +Result (hr): + S15-S0 = 073f = 0b0000011100111111 + Done -- To view, visit https://gerrit.osmocom.org/11024 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: Ia782e21c206c15e840226d79b4209d13658ee916 Gerrit-Change-Number: 11024 Gerrit-PatchSet: 2 Gerrit-Owner: dexter 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 Sep 19 14:03:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:03:05 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 6: (2 comments) > No merge yet since I think some stuff is still being prepared. Better mark is as WIP meanwhile. It's pretty much finished already, I'll just switch `docker run` parameters, so we don't need `--entrypoint`. https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/jenkins.sh File debian-repo-install-test/jenkins.sh: https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/jenkins.sh at 14 PS6, Line 14: --entrypoint "/testdata/repo-install-test.sh" \ > interesting, --entrypoint; so far in the other jenkins. [?] I haven't really used docker much (besides in gitlab-ci configs, where you don't specify a `docker run` command line), so I wasn't aware that you can put the command as last argument. I figured `--entrypoint` would be the way to do it. But now that you say it, placing it at the end is shorter and it even allows specifying arguments to the commands. This is the better way then, I'll push another patch that changes this. (I guess the difference is, that with the entrypoint you could override the default shell.) https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/testdata/repo-install-test.sh File debian-repo-install-test/testdata/repo-install-test.sh: https://gerrit.osmocom.org/#/c/10862/6/debian-repo-install-test/testdata/repo-install-test.sh at 49 PS6, Line 49: osmo-bsc --version > it's not really the task at hand, but in the past we also had the problem that some packages would g [?] created https://osmocom.org/issues/3555 for that -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 14:03:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:10:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:10:52 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10862 to look at the new patch set (#7). Change subject: debian-repo-install-test: new binary package test ...................................................................... debian-repo-install-test: new binary package test Installs most packages from the Osmocom Debian repository into a plain debian:stretch container and call the osmo-* binaries with --version (or -h). The list of packages is automatically generated with aptitude, so the job does not need to be changed for every new package. There's also a new blacklist.txt file with a list of packages, that will not be installed in this test. Currently, this is filled with all packages built from the legacy openbsc.git project (some of them are conflicting with newer repositories) and the soapysdr packages (see OS#3541). The feed ("latest", "nightly") can be specified with the FEED environment variable, it gets read by jenkins.sh (defaults to nightly). Change-Id: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Relates: OS#3176 --- A debian-repo-install-test/jenkins.sh A debian-repo-install-test/testdata/Release.key A debian-repo-install-test/testdata/blacklist.txt A debian-repo-install-test/testdata/repo-install-test.sh 4 files changed, 148 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/10862/7 -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:14:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:14:37 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 7: Verified+1 -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 14:14: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 Sep 19 14:24:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Sep 2018 14:24:18 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 14:24: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 Sep 19 14:24:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:24:54 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... debian-repo-install-test: new binary package test Installs most packages from the Osmocom Debian repository into a plain debian:stretch container and call the osmo-* binaries with --version (or -h). The list of packages is automatically generated with aptitude, so the job does not need to be changed for every new package. There's also a new blacklist.txt file with a list of packages, that will not be installed in this test. Currently, this is filled with all packages built from the legacy openbsc.git project (some of them are conflicting with newer repositories) and the soapysdr packages (see OS#3541). The feed ("latest", "nightly") can be specified with the FEED environment variable, it gets read by jenkins.sh (defaults to nightly). Change-Id: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Relates: OS#3176 --- A debian-repo-install-test/jenkins.sh A debian-repo-install-test/testdata/Release.key A debian-repo-install-test/testdata/blacklist.txt A debian-repo-install-test/testdata/repo-install-test.sh 4 files changed, 148 insertions(+), 0 deletions(-) Approvals: osmith: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/debian-repo-install-test/jenkins.sh b/debian-repo-install-test/jenkins.sh new file mode 100755 index 0000000..9dd4565 --- /dev/null +++ b/debian-repo-install-test/jenkins.sh @@ -0,0 +1,18 @@ +#!/bin/sh +. ../jenkins-common.sh + +# Configuration +[ -z "$FEED" ] && FEED="nightly" +interactive="false" + +# Run the container +extra_args="" +[ "$interactive" = "true" ] && extra_args="-it" +docker run --rm \ + -v "$PWD/testdata:/testdata:ro" \ + -v "$VOL_BASE_DIR:/data" \ + --name "${BUILD_TAG}" \ + -e FEED="$FEED" \ + $extra_args \ + debian:stretch \ + "/testdata/repo-install-test.sh" diff --git a/debian-repo-install-test/testdata/Release.key b/debian-repo-install-test/testdata/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/debian-repo-install-test/testdata/Release.key @@ -0,0 +1,20 @@ +-----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----- diff --git a/debian-repo-install-test/testdata/blacklist.txt b/debian-repo-install-test/testdata/blacklist.txt new file mode 100644 index 0000000..4d3f7ed --- /dev/null +++ b/debian-repo-install-test/testdata/blacklist.txt @@ -0,0 +1,25 @@ +# These packages will not get explicitly installed in this test. +# Package lines must have nothing but the package (no comment, +# no additional space etc). + +# OpenBSC +# This is legacy, we aren't really interested in testing openbsc.git +# derived packages. Packages are found in openbsc/debian/control. +openbsc-dev +osmo-bsc-mgcp +osmo-bsc-mgcp-dbg +osmocom-bs11-utils +osmocom-bs11-utils-dbg +osmocom-bsc-nat +osmocom-bsc-nat-dbg +osmocom-bsc-sccplite +osmocom-bsc-sccplite-dbg +osmocom-ipaccess-utils +osmocom-ipaccess-utils-dbg +osmocom-nitb +osmocom-nitb-dbg + +# SoapySDR is not used anymore (see OS#3542) +soapysdr-module-lms7 +soapysdr0.6-module-lms7 +soapysdr0.6-module-lms7-dbgsym diff --git a/debian-repo-install-test/testdata/repo-install-test.sh b/debian-repo-install-test/testdata/repo-install-test.sh new file mode 100755 index 0000000..ea1c5fb --- /dev/null +++ b/debian-repo-install-test/testdata/repo-install-test.sh @@ -0,0 +1,85 @@ +#!/bin/sh -ex + +HTTP="http://download.opensuse.org/repositories/network:/osmocom:/$FEED/Debian_9.0/" +OBS="obs://build.opensuse.org/network:osmocom:$FEED/Debian_9.0" + +check_env() { + if [ -n "$FEED" ]; then + echo "Checking feed: $FEED" + else + echo "ERROR: missing environment variable \$FEED!" + exit 1 + fi +} + +install_depends() { + echo "Installing dependencies" + apt-get update + apt-get install -y gnupg aptitude +} + +configure_osmocom_repo() { + echo "Configuring Osmocom repository" + apt-key add /testdata/Release.key + echo "deb $HTTP ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list + apt-get update +} + +install_repo_packages() { + echo "Installing all repository packages" + + # Get a list of all packages from the repository. Reference: + # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html + aptitude search -F%p \ + "?origin($OBS) ?architecture(native)" | sort \ + > /data/osmocom_packages_all.txt + + # Remove comments from blacklist.txt (and sort it) + grep -v "^#" /testdata/blacklist.txt | sort -u > /data/blacklist.txt + + # Install all repo packages which are not on the blacklist + comm -23 /data/osmocom_packages_all.txt \ + /data/blacklist.txt > /data/osmocom_packages.txt + apt install -y $(cat /data/osmocom_packages.txt) +} + +test_binaries() { + # Make sure the binaries are not broken (run -h or --version) + osmo-bsc --version + osmo-bts-trx --version + osmo-bts-virtual --version + osmo-gbproxy --version + osmo-ggsn --version + osmo-gtphub -h + osmo-hlr --version + osmo-hlr-db-tool --version + osmo-hnbgw --version + osmo-mgw --version + osmo-msc --version + osmo-pcu --version + osmo-sgsn --version + osmo-sip-connector -h + osmo-stp --version + osmo-trx-uhd -h + osmo-trx-usrp1 -h +} + +finish() { + echo "Test finished successfully!" + + # When docker-run is called with "-it", then stdin and a tty are available. + # The container will still exit when the entrypoint script (this file) is + # through, so in order to be able to type in commands, we execute a bash shell. + if [ -t 0 ]; then + echo "Dropping to interactive shell" + bash + fi +} + +check_env +install_depends +configure_osmocom_repo +install_repo_packages +test_binaries +finish -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 14:25:38 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: new binary package test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10862 ) Change subject: debian-repo-install-test: new binary package test ...................................................................... Patch Set 7: Ah sorry, I confused the patch with the one regarding the pkgcfg script ;-) -- To view, visit https://gerrit.osmocom.org/10862 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: I0f0a8b4f0ccd706cd1af98fe25accd6fd410e007 Gerrit-Change-Number: 10862 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Sep 2018 14:25:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:32:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:32:48 +0000 Subject: Change in osmo-ci[master]: osmocom-debian-install.yml: new jenkins jobs Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11031 Change subject: osmocom-debian-install.yml: new jenkins jobs ...................................................................... osmocom-debian-install.yml: new jenkins jobs Installs most packages from the Osmocom Debian repository into a plain debian:stretch container and call the osmo-* binaries with --version (or -h). Two jobs, one for nightly and one for latest. Change-Id: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Related: OS#3176 --- A jobs/osmocom-debian-install.yml 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/31/11031/1 diff --git a/jobs/osmocom-debian-install.yml b/jobs/osmocom-debian-install.yml new file mode 100644 index 0000000..155aebd --- /dev/null +++ b/jobs/osmocom-debian-install.yml @@ -0,0 +1,30 @@ +--- +- project: + name: Osmocom-Debian-install + jobs: + - Osmocom-Debian-install-{type} + type: + - nightly + - latest + +- job-template: + name: 'Osmocom-Debian-install-{type}' + + project-type: freestyle + defaults: global + description: 'Generated by job-builder' + node: osmocom-master-debian9 + builders: + - shell: + cd debian-repo-install-test && FEED={type} ./jenkins.sh + scm: + - git: + branches: + - '*/osmith/deb-install-test' + url: git://git.osmocom.org/docker-playground + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + triggers: + - timed: "@midnight" + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/11031 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: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Gerrit-Change-Number: 11031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:36:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:36:25 +0000 Subject: Change in osmo-ci[master]: gitignore: add __pycache__ Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11032 Change subject: gitignore: add __pycache__ ...................................................................... gitignore: add __pycache__ The osmo-depcheck script consists of multiple Python files. Python creates a __pycache__ folder, so let's make sure that does not get added by accident into the git repository. Related: OS#2642 Change-Id: Ic8fb08fec1629846fc0712d6bc0b6288fbba7dc9 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/11032/1 diff --git a/.gitignore b/.gitignore index 07c4349..1717928 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .*.sw? jenkins_jobs.ini jenkins-jobs.ini +__pycache__/ -- To view, visit https://gerrit.osmocom.org/11032 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: Ic8fb08fec1629846fc0712d6bc0b6288fbba7dc9 Gerrit-Change-Number: 11032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:42:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:42:31 +0000 Subject: Change in osmo-ci[master]: osmocom-debian-install.yml: new jenkins jobs In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11031 ) Change subject: osmocom-debian-install.yml: new jenkins jobs ...................................................................... osmocom-debian-install.yml: new jenkins jobs Installs most packages from the Osmocom Debian repository into a plain debian:stretch container and call the osmo-* binaries with --version (or -h). Two jobs, one for nightly and one for latest. Change-Id: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Related: OS#3176 --- A jobs/osmocom-debian-install.yml 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/31/11031/2 -- To view, visit https://gerrit.osmocom.org/11031 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: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Gerrit-Change-Number: 11031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 19 14:43:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 19 Sep 2018 14:43:40 +0000 Subject: Change in osmo-ci[master]: osmocom-debian-install.yml: new jenkins jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11031 ) Change subject: osmocom-debian-install.yml: new jenkins jobs ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11031 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: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Gerrit-Change-Number: 11031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Sep 2018 14:43:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Sep 19 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Sep 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_#251?= In-Reply-To: <1972861012.166.1537283406585.JavaMail.jenkins@jenkins.osmocom.org> References: <1972861012.166.1537283406585.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <689879138.182.1537369806633.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_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 -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_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_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 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_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 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 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_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 Sep 19 18:12:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 18:12:58 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Split Device specific section from backend one Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11033 Change subject: osmotrx: Split Device specific section from backend one ...................................................................... osmotrx: Split Device specific section from backend one Device specific sections will be added to this new chapter. Change-Id: Id96cbf857e2ef92d9ad2cb58fd18132f981447d7 --- M OsmoTRX/chapters/trx-backends.adoc A OsmoTRX/chapters/trx-devices.adoc M OsmoTRX/osmotrx-usermanual.adoc 3 files changed, 27 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/33/11033/1 diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc index 32ff82a..5da2e5c 100644 --- a/OsmoTRX/chapters/trx-backends.adoc +++ b/OsmoTRX/chapters/trx-backends.adoc @@ -1,29 +1,3 @@ -[[osmotrx_device_support]] -== OsmoTRX hardware device support - -OsmoTRX consists of a _common_ part that applies to all TRX devices as well as -_hardware-specific_ parts for each TRX device. The hardware-specific parts are -usually provided by vendor-specific or device-specific libraries that are then -handled by some OsmoTRX glue code presenting a unified interface towards the -rest of the code by means of a _RadioDevice_ class. - -The common part includes the core TRX architecture as well as code for -implementing the external interfaces such as the TRX Manager UDP socket, -control, and VTY interfaces. - -The hardware-specific parts include support for driving one particular -implementation of a radio modem. Such a physical layer -implementation can come in many forms. Sometimes it runs on a general -purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a -combination of DSP and FPGA. - -Joining the common part with each of the available backends results in a -different binary with different suffix for each backend. For instance, when -OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when -OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. -Build of different backend can be enabled and disabled by means of configure -flags, which can be found in each subsection relative to each backend below. - == `osmo-trx-uhd` for UHD based Transceivers This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the diff --git a/OsmoTRX/chapters/trx-devices.adoc b/OsmoTRX/chapters/trx-devices.adoc new file mode 100644 index 0000000..08ef773 --- /dev/null +++ b/OsmoTRX/chapters/trx-devices.adoc @@ -0,0 +1,25 @@ +[[osmotrx_device_support]] +== OsmoTRX hardware device support + +OsmoTRX consists of a _common_ part that applies to all TRX devices as well as +_hardware-specific_ parts for each TRX device. The hardware-specific parts are +usually provided by vendor-specific or device-specific libraries that are then +handled by some OsmoTRX glue code presenting a unified interface towards the +rest of the code by means of a _RadioDevice_ class. + +The common part includes the core TRX architecture as well as code for +implementing the external interfaces such as the TRX Manager UDP socket, +control, and VTY interfaces. + +The hardware-specific parts include support for driving one particular +implementation of a radio modem. Such a physical layer +implementation can come in many forms. Sometimes it runs on a general +purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a +combination of DSP and FPGA. + +Joining the common part with each of the available backends results in a +different binary with different suffix for each backend. For instance, when +OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when +OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. +Build of different backend can be enabled and disabled by means of configure +flags, which can be found in each subsection relative to each backend below. diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index 7d04f78..a713e4a 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -25,6 +25,8 @@ include::chapters/trx-architectures.adoc[] +include::chapters/trx-devices.adoc[] + include::chapters/trx-backends.adoc[] include::../common/chapters/trx_if.adoc[] -- To view, visit https://gerrit.osmocom.org/11033 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: Id96cbf857e2ef92d9ad2cb58fd18132f981447d7 Gerrit-Change-Number: 11033 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 Sep 19 18:12:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 18:12:59 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Write initial documentation for several supported devices Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11034 Change subject: osmotrx: Write initial documentation for several supported devices ...................................................................... osmotrx: Write initial documentation for several supported devices Change-Id: I902b01ca661416eb9705afac8a34ec8d2fb13789 --- M OsmoTRX/chapters/trx-backends.adoc M OsmoTRX/chapters/trx-devices.adoc 2 files changed, 68 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/34/11034/1 diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc index 5da2e5c..e801886 100644 --- a/OsmoTRX/chapters/trx-backends.adoc +++ b/OsmoTRX/chapters/trx-backends.adoc @@ -1,3 +1,4 @@ +[[backend_uhd]] == `osmo-trx-uhd` for UHD based Transceivers This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the @@ -15,6 +16,7 @@ Related code can be found in the _Transceiver52M/device/uhd/_ directory in _osmo-trx.git_. +[[backend_lms]] == `osmo-trx-lms` for LimeSuite based Transceivers This OsmoTRX model uses LimeSuite API and library to drive the device, that is @@ -27,7 +29,7 @@ Related code can be found in the _Transceiver52M/device/lms/_ directory in _osmo-trx.git_. - +[[backend_usrp1]] == `osmo-trx-usrp1` for libusrp based Transceivers This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2. diff --git a/OsmoTRX/chapters/trx-devices.adoc b/OsmoTRX/chapters/trx-devices.adoc index 08ef773..10c8529 100644 --- a/OsmoTRX/chapters/trx-devices.adoc +++ b/OsmoTRX/chapters/trx-devices.adoc @@ -23,3 +23,68 @@ OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. Build of different backend can be enabled and disabled by means of configure flags, which can be found in each subsection relative to each backend below. + +[[dev_ettus_usrp1]] +=== Ettus USRP1 + +The binary _osmo-trx-usrp1_ is used to drive this device, see <>. + +[[dev_ettus_b200]] +=== Ettus B200 + +The binary _osmo-trx-uhd_ is used to drive this device, see <>. + +Comes only with 1 RF channel. It can still be used in a multi-TRX setup by using +the <> feature. By using this feature, one can drive up to 3 +TRX (with the restrictions explained there). + +[[dev_ettus_b200]] +=== Ettus B210 + +The binary _osmo-trx-uhd_ is used to drive this device, see <>. + +Comes with 2 RF channels, which can be used to set up a multi-TRX BTS. However, +due to a shared local oscillator for both RF channels, ARFCN separation can be +up about 25 MHz. + +This device also supports the <> feature. By using this +feature, one can drive up to 3 TRX (with the restrictions explained there). +Please note that the above configurations cannot be combined, which means +maximum number of TRX one can achieve is 2 by using separate physical RF +channels, or 3 by using multi-ARFCN method. You cannot support, for example, 6 +ARFCN operation on B210 using 3 TRX on side A and another 3 TRX on side B. + +[[dev_limesdr_usb]] +=== LimeSDR-USB + +The binary _osmo-trx-lms_ is used to drive this device, see <>. + +This device comes with 2 RF channels, so it should theoretically be possible to +run a multi-TRX setup with it, but there are yet no records that this kind of +setup was tested with this device. + +This device has 3 different Rx paths with different antenna connectors in the +PCB, each with a different frequency and bandwidth range. One should make sure +the physical antenna is connected to the correct connector matching the Rx path +you want to use. If one wants to be able to use the device in both 900 and 1800 +MHz GSM bands and easily switch between them, then Rx Path `LNAW` should be used +,since it is the only one covering both bands, and the antenna physically plugged +accordingly. Following example shows how to then configure _osmo-trx-lms_ to use +that Rx path to read samples. + +.Example: Configure osmo-trx-lms to use LNAW as Rx path and BAND1 as Tx Path +---- +trx + ... + chan 0 + tx-path BAND1 + rx-path LNAW +---- + +[[dev_limesdr_mini]] +=== LimeSDR-mini + +The binary _osmo-trx-lms_ is used to drive this device, see <>. + +As a smaller brother of the [[dev_limesdr_usb]], this device comes only with 1 +RF channel. As a result, it can only hold 1 TRX as of today. -- To view, visit https://gerrit.osmocom.org/11034 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: I902b01ca661416eb9705afac8a34ec8d2fb13789 Gerrit-Change-Number: 11034 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 Sep 19 18:12:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Sep 2018 18:12:59 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: configuration: Add section to document multi-arfcn feature Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11035 Change subject: osmotrx: configuration: Add section to document multi-arfcn feature ...................................................................... osmotrx: configuration: Add section to document multi-arfcn feature Change-Id: Id04c7f7c36d8a8be8145ef8009ece26ef1a7cdff --- M OsmoTRX/chapters/configuration.adoc 1 file changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/35/11035/1 diff --git a/OsmoTRX/chapters/configuration.adoc b/OsmoTRX/chapters/configuration.adoc index cdde366..87d7903 100644 --- a/OsmoTRX/chapters/configuration.adoc +++ b/OsmoTRX/chapters/configuration.adoc @@ -34,3 +34,52 @@ <7> Configure the first channel. As no other channels are specified, `osmo-trx` assumes it is using only one channel. <8> Configure the device to use `BAND1` Tx antenna path from all the available ones (device specific). <9> Configure the device to use `LNAW` Rx antenna path from all the available ones (device specific). + +[[multiarfcn_mode]] +=== Multi-ARFCN mode + +The Multi-ARFCN feature allows to have a multi-carrier approach multiplexed on a +single physical RF channel, which can introduce several benefits, such as lower +cost and higher capacity support. + +Multi-ARFCN support is available since osmo-trx release `0.2.0`, and it was +added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. + +This feature is useful for instance if you want to run more than 1 TRX with an +Ettus B200 device, or 3 TRX with an Ettus B210 device, since they support only 1 +and 2 physical RF channels respectively. No device from other providers or even +other devices than B200 and B210 from Ettus are known to support this feature. + +With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. +So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to +three ARFCN's is supported for multi-TRX. + +From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN +feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup, +leaving apart of course the mentioned ARFCN limitations explained above and as a +consequence physical installation and operational differences. + +.Example: osmo-bts-trx.cfg using 2 TRX against an osmo-trx driven device +---- +phy 0 + osmotrx ip local 127.0.0.1 + osmotrx ip remote 127.0.0.1 + instance 0 + instance 1 +bts 0 + ... + band GSM-1800 + trx 0 + phy 0 instance 0 + trx 1 + phy 0 instance 1 +---- + +.Example: osmo-trx.cfg using Multi-ARFCN mode to run 2 TRX +---- +trx + ... + multi-arfcn enable + chan 0 + chan 1 +---- -- To view, visit https://gerrit.osmocom.org/11035 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: Id04c7f7c36d8a8be8145ef8009ece26ef1a7cdff Gerrit-Change-Number: 11035 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 Sep 19 18:36:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:36:00 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Split Device specific section from backend one In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11033 ) Change subject: osmotrx: Split Device specific section from backend one ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11033 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: Id96cbf857e2ef92d9ad2cb58fd18132f981447d7 Gerrit-Change-Number: 11033 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Sep 2018 18:36: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 Sep 19 18:36:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:36:31 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Write initial documentation for several supported devices In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11034 ) Change subject: osmotrx: Write initial documentation for several supported devices ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11034 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: I902b01ca661416eb9705afac8a34ec8d2fb13789 Gerrit-Change-Number: 11034 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Sep 2018 18:36: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 Sep 19 18:37:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:37:22 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: configuration: Add section to document multi-arfcn feature In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11035 ) Change subject: osmotrx: configuration: Add section to document multi-arfcn feature ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11035 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: Id04c7f7c36d8a8be8145ef8009ece26ef1a7cdff Gerrit-Change-Number: 11035 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Sep 2018 18:37: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 Sep 19 18:37:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:37:23 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Split Device specific section from backend one In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11033 ) Change subject: osmotrx: Split Device specific section from backend one ...................................................................... osmotrx: Split Device specific section from backend one Device specific sections will be added to this new chapter. Change-Id: Id96cbf857e2ef92d9ad2cb58fd18132f981447d7 --- M OsmoTRX/chapters/trx-backends.adoc A OsmoTRX/chapters/trx-devices.adoc M OsmoTRX/osmotrx-usermanual.adoc 3 files changed, 27 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc index 32ff82a..5da2e5c 100644 --- a/OsmoTRX/chapters/trx-backends.adoc +++ b/OsmoTRX/chapters/trx-backends.adoc @@ -1,29 +1,3 @@ -[[osmotrx_device_support]] -== OsmoTRX hardware device support - -OsmoTRX consists of a _common_ part that applies to all TRX devices as well as -_hardware-specific_ parts for each TRX device. The hardware-specific parts are -usually provided by vendor-specific or device-specific libraries that are then -handled by some OsmoTRX glue code presenting a unified interface towards the -rest of the code by means of a _RadioDevice_ class. - -The common part includes the core TRX architecture as well as code for -implementing the external interfaces such as the TRX Manager UDP socket, -control, and VTY interfaces. - -The hardware-specific parts include support for driving one particular -implementation of a radio modem. Such a physical layer -implementation can come in many forms. Sometimes it runs on a general -purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a -combination of DSP and FPGA. - -Joining the common part with each of the available backends results in a -different binary with different suffix for each backend. For instance, when -OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when -OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. -Build of different backend can be enabled and disabled by means of configure -flags, which can be found in each subsection relative to each backend below. - == `osmo-trx-uhd` for UHD based Transceivers This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the diff --git a/OsmoTRX/chapters/trx-devices.adoc b/OsmoTRX/chapters/trx-devices.adoc new file mode 100644 index 0000000..08ef773 --- /dev/null +++ b/OsmoTRX/chapters/trx-devices.adoc @@ -0,0 +1,25 @@ +[[osmotrx_device_support]] +== OsmoTRX hardware device support + +OsmoTRX consists of a _common_ part that applies to all TRX devices as well as +_hardware-specific_ parts for each TRX device. The hardware-specific parts are +usually provided by vendor-specific or device-specific libraries that are then +handled by some OsmoTRX glue code presenting a unified interface towards the +rest of the code by means of a _RadioDevice_ class. + +The common part includes the core TRX architecture as well as code for +implementing the external interfaces such as the TRX Manager UDP socket, +control, and VTY interfaces. + +The hardware-specific parts include support for driving one particular +implementation of a radio modem. Such a physical layer +implementation can come in many forms. Sometimes it runs on a general +purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a +combination of DSP and FPGA. + +Joining the common part with each of the available backends results in a +different binary with different suffix for each backend. For instance, when +OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when +OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. +Build of different backend can be enabled and disabled by means of configure +flags, which can be found in each subsection relative to each backend below. diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index 7d04f78..a713e4a 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -25,6 +25,8 @@ include::chapters/trx-architectures.adoc[] +include::chapters/trx-devices.adoc[] + include::chapters/trx-backends.adoc[] include::../common/chapters/trx_if.adoc[] -- To view, visit https://gerrit.osmocom.org/11033 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: Id96cbf857e2ef92d9ad2cb58fd18132f981447d7 Gerrit-Change-Number: 11033 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 Sep 19 18:37:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:37:23 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Write initial documentation for several supported devices In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11034 ) Change subject: osmotrx: Write initial documentation for several supported devices ...................................................................... osmotrx: Write initial documentation for several supported devices Change-Id: I902b01ca661416eb9705afac8a34ec8d2fb13789 --- M OsmoTRX/chapters/trx-backends.adoc M OsmoTRX/chapters/trx-devices.adoc 2 files changed, 68 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc index 5da2e5c..e801886 100644 --- a/OsmoTRX/chapters/trx-backends.adoc +++ b/OsmoTRX/chapters/trx-backends.adoc @@ -1,3 +1,4 @@ +[[backend_uhd]] == `osmo-trx-uhd` for UHD based Transceivers This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the @@ -15,6 +16,7 @@ Related code can be found in the _Transceiver52M/device/uhd/_ directory in _osmo-trx.git_. +[[backend_lms]] == `osmo-trx-lms` for LimeSuite based Transceivers This OsmoTRX model uses LimeSuite API and library to drive the device, that is @@ -27,7 +29,7 @@ Related code can be found in the _Transceiver52M/device/lms/_ directory in _osmo-trx.git_. - +[[backend_usrp1]] == `osmo-trx-usrp1` for libusrp based Transceivers This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2. diff --git a/OsmoTRX/chapters/trx-devices.adoc b/OsmoTRX/chapters/trx-devices.adoc index 08ef773..10c8529 100644 --- a/OsmoTRX/chapters/trx-devices.adoc +++ b/OsmoTRX/chapters/trx-devices.adoc @@ -23,3 +23,68 @@ OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. Build of different backend can be enabled and disabled by means of configure flags, which can be found in each subsection relative to each backend below. + +[[dev_ettus_usrp1]] +=== Ettus USRP1 + +The binary _osmo-trx-usrp1_ is used to drive this device, see <>. + +[[dev_ettus_b200]] +=== Ettus B200 + +The binary _osmo-trx-uhd_ is used to drive this device, see <>. + +Comes only with 1 RF channel. It can still be used in a multi-TRX setup by using +the <> feature. By using this feature, one can drive up to 3 +TRX (with the restrictions explained there). + +[[dev_ettus_b200]] +=== Ettus B210 + +The binary _osmo-trx-uhd_ is used to drive this device, see <>. + +Comes with 2 RF channels, which can be used to set up a multi-TRX BTS. However, +due to a shared local oscillator for both RF channels, ARFCN separation can be +up about 25 MHz. + +This device also supports the <> feature. By using this +feature, one can drive up to 3 TRX (with the restrictions explained there). +Please note that the above configurations cannot be combined, which means +maximum number of TRX one can achieve is 2 by using separate physical RF +channels, or 3 by using multi-ARFCN method. You cannot support, for example, 6 +ARFCN operation on B210 using 3 TRX on side A and another 3 TRX on side B. + +[[dev_limesdr_usb]] +=== LimeSDR-USB + +The binary _osmo-trx-lms_ is used to drive this device, see <>. + +This device comes with 2 RF channels, so it should theoretically be possible to +run a multi-TRX setup with it, but there are yet no records that this kind of +setup was tested with this device. + +This device has 3 different Rx paths with different antenna connectors in the +PCB, each with a different frequency and bandwidth range. One should make sure +the physical antenna is connected to the correct connector matching the Rx path +you want to use. If one wants to be able to use the device in both 900 and 1800 +MHz GSM bands and easily switch between them, then Rx Path `LNAW` should be used +,since it is the only one covering both bands, and the antenna physically plugged +accordingly. Following example shows how to then configure _osmo-trx-lms_ to use +that Rx path to read samples. + +.Example: Configure osmo-trx-lms to use LNAW as Rx path and BAND1 as Tx Path +---- +trx + ... + chan 0 + tx-path BAND1 + rx-path LNAW +---- + +[[dev_limesdr_mini]] +=== LimeSDR-mini + +The binary _osmo-trx-lms_ is used to drive this device, see <>. + +As a smaller brother of the [[dev_limesdr_usb]], this device comes only with 1 +RF channel. As a result, it can only hold 1 TRX as of today. -- To view, visit https://gerrit.osmocom.org/11034 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: I902b01ca661416eb9705afac8a34ec8d2fb13789 Gerrit-Change-Number: 11034 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 Sep 19 18:37:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:37:24 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: configuration: Add section to document multi-arfcn feature In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11035 ) Change subject: osmotrx: configuration: Add section to document multi-arfcn feature ...................................................................... osmotrx: configuration: Add section to document multi-arfcn feature Change-Id: Id04c7f7c36d8a8be8145ef8009ece26ef1a7cdff --- M OsmoTRX/chapters/configuration.adoc 1 file changed, 49 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoTRX/chapters/configuration.adoc b/OsmoTRX/chapters/configuration.adoc index cdde366..87d7903 100644 --- a/OsmoTRX/chapters/configuration.adoc +++ b/OsmoTRX/chapters/configuration.adoc @@ -34,3 +34,52 @@ <7> Configure the first channel. As no other channels are specified, `osmo-trx` assumes it is using only one channel. <8> Configure the device to use `BAND1` Tx antenna path from all the available ones (device specific). <9> Configure the device to use `LNAW` Rx antenna path from all the available ones (device specific). + +[[multiarfcn_mode]] +=== Multi-ARFCN mode + +The Multi-ARFCN feature allows to have a multi-carrier approach multiplexed on a +single physical RF channel, which can introduce several benefits, such as lower +cost and higher capacity support. + +Multi-ARFCN support is available since osmo-trx release `0.2.0`, and it was +added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. + +This feature is useful for instance if you want to run more than 1 TRX with an +Ettus B200 device, or 3 TRX with an Ettus B210 device, since they support only 1 +and 2 physical RF channels respectively. No device from other providers or even +other devices than B200 and B210 from Ettus are known to support this feature. + +With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. +So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to +three ARFCN's is supported for multi-TRX. + +From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN +feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup, +leaving apart of course the mentioned ARFCN limitations explained above and as a +consequence physical installation and operational differences. + +.Example: osmo-bts-trx.cfg using 2 TRX against an osmo-trx driven device +---- +phy 0 + osmotrx ip local 127.0.0.1 + osmotrx ip remote 127.0.0.1 + instance 0 + instance 1 +bts 0 + ... + band GSM-1800 + trx 0 + phy 0 instance 0 + trx 1 + phy 0 instance 1 +---- + +.Example: osmo-trx.cfg using Multi-ARFCN mode to run 2 TRX +---- +trx + ... + multi-arfcn enable + chan 0 + chan 1 +---- -- To view, visit https://gerrit.osmocom.org/11035 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: Id04c7f7c36d8a8be8145ef8009ece26ef1a7cdff Gerrit-Change-Number: 11035 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 Sep 19 18:38:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:38:20 +0000 Subject: Change in osmo-ci[master]: osmocom-debian-install.yml: new jenkins jobs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11031 ) Change subject: osmocom-debian-install.yml: new jenkins jobs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11031 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: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Gerrit-Change-Number: 11031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Sep 2018 18:38: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 Sep 19 18:38:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:38:39 +0000 Subject: Change in osmo-ci[master]: gitignore: add __pycache__ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11032 ) Change subject: gitignore: add __pycache__ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11032 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: Ic8fb08fec1629846fc0712d6bc0b6288fbba7dc9 Gerrit-Change-Number: 11032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 19 Sep 2018 18:38: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 Sep 19 18:38:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:38:53 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log file to appear in the artifacts. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11013 ) Change subject: ttcn3-sgsn-test: save the log file to appear in the artifacts. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 19 Sep 2018 18:38: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 Sep 19 18:39:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Sep 2018 18:39:17 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add jenkins-build-osmo-iuh.sh In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11026 ) Change subject: contrib: Add jenkins-build-osmo-iuh.sh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11026 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: I75cb9551db6b1b4aa5bfb76177694c14fad82f04 Gerrit-Change-Number: 11026 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Sep 2018 18:39:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Sep 19 19:56:05 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:56:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5ba2a9d96f4ee_48589206801204d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 80s] No package 'libpcsclite' found [ 80s] simtrace2-remsim.o: In function `main': [ 80s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 80s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 80s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 80s] apdu_dispatch.o: In function `apdu_segment_in': [ 80s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 80s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 80s] collect2: error: ld returned 1 exit status [ 80s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 80s] make[2]: *** [simtrace2-remsim] Error 1 [ 80s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 80s] Makefile:20: recipe for target 'utils' failed [ 80s] make[1]: *** [utils] Error 2 [ 80s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 80s] dh_auto_build: make -j1 returned exit code 2 [ 80s] debian/rules:4: recipe for target 'build' failed [ 80s] make: *** [build] Error 2 [ 80s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 80s] [ 80s] build71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:55:51 UTC 2018. [ 80s] [ 80s] ### VM INTERACTION START ### [ 83s] [ 76.200649] sysrq: SysRq : Power Off [ 83s] [ 76.202477] reboot: Power down [ 83s] ### VM INTERACTION END ### [ 83s] [ 83s] build71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:55:54 UTC 2018. [ 83s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:56:05 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:56:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5ba2a9d8aaf13_4858920680120212@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 84s] No package 'libpcsclite' found [ 84s] simtrace2-remsim.o: In function `main': [ 84s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 84s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 84s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 84s] apdu_dispatch.o: In function `apdu_segment_in': [ 84s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 84s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 84s] collect2: error: ld returned 1 exit status [ 84s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 84s] make[2]: *** [simtrace2-remsim] Error 1 [ 84s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 84s] Makefile:20: recipe for target 'utils' failed [ 84s] make[1]: *** [utils] Error 2 [ 84s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 84s] dh_auto_build: make -j1 returned exit code 2 [ 84s] debian/rules:4: recipe for target 'build' failed [ 84s] make: *** [build] Error 2 [ 84s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 84s] [ 84s] build82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:00 UTC 2018. [ 84s] [ 84s] ### VM INTERACTION START ### [ 87s] [ 79.525597] sysrq: SysRq : Power Off [ 87s] [ 79.527259] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] build82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:04 UTC 2018. [ 87s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:56:39 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:56:39 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5ba2a9f8a477_48589206801205ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 119s] No package 'libpcsclite' found [ 119s] simtrace2-remsim.o: In function `main': [ 119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 119s] apdu_dispatch.o: In function `apdu_segment_in': [ 119s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 119s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 119s] collect2: error: ld returned 1 exit status [ 119s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 119s] make[2]: *** [simtrace2-remsim] Error 1 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 119s] Makefile:20: recipe for target 'utils' failed [ 119s] make[1]: *** [utils] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 119s] dh_auto_build: make -j1 returned exit code 2 [ 119s] debian/rules:4: recipe for target 'build' failed [ 119s] make: *** [build] Error 2 [ 119s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 119s] [ 119s] sheep84 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:31 UTC 2018. [ 119s] [ 119s] ### VM INTERACTION START ### [ 122s] [ 114.348710] sysrq: SysRq : Power Off [ 122s] [ 114.354868] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] sheep84 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:34 UTC 2018. [ 122s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:56:56 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:56:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5ba2aa11de535_48589206801207de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 137s] No package 'libpcsclite' found [ 137s] simtrace2-remsim.o: In function `main': [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 137s] apdu_dispatch.o: In function `apdu_segment_in': [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 137s] collect2: error: ld returned 1 exit status [ 137s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 137s] make[2]: *** [simtrace2-remsim] Error 1 [ 137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 137s] Makefile:20: recipe for target 'utils' failed [ 137s] make[1]: *** [utils] Error 2 [ 137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 137s] dh_auto_build: make -j1 returned exit code 2 [ 137s] debian/rules:4: recipe for target 'build' failed [ 137s] make: *** [build] Error 2 [ 137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 137s] [ 137s] lamb15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:49 UTC 2018. [ 137s] [ 137s] ### VM INTERACTION START ### [ 140s] [ 130.351718] sysrq: SysRq : Power Off [ 140s] [ 130.360146] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:53 UTC 2018. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:56:56 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:56:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5ba2aa1193dfc_48589206801206ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 136s] No package 'libpcsclite' found [ 136s] simtrace2-remsim.o: In function `main': [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 136s] apdu_dispatch.o: In function `apdu_segment_in': [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 136s] collect2: error: ld returned 1 exit status [ 136s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 136s] make[2]: *** [simtrace2-remsim] Error 1 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 136s] Makefile:20: recipe for target 'utils' failed [ 136s] make[1]: *** [utils] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s] dh_auto_build: make -j1 returned exit code 2 [ 136s] debian/rules:4: recipe for target 'build' failed [ 136s] make: *** [build] Error 2 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] lamb22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:43 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 140s] [ 129.636633] sysrq: SysRq : Power Off [ 140s] [ 129.642172] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:56:47 UTC 2018. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:57:13 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:57:13 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5ba2aa304d3f6_48589206801208bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 152s] No package 'libpcsclite' found [ 152s] simtrace2-remsim.o: In function `main': [ 152s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 152s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 152s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 152s] apdu_dispatch.o: In function `apdu_segment_in': [ 152s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 152s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 152s] collect2: error: ld returned 1 exit status [ 152s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 152s] make[2]: *** [simtrace2-remsim] Error 1 [ 152s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 152s] Makefile:20: recipe for target 'utils' failed [ 152s] make[1]: *** [utils] Error 2 [ 152s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 152s] dh_auto_build: make -j1 returned exit code 2 [ 152s] debian/rules:4: recipe for target 'build' failed [ 152s] make: *** [build] Error 2 [ 152s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 152s] [ 152s] lamb23 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:57:02 UTC 2018. [ 152s] [ 152s] ### VM INTERACTION START ### [ 156s] [ 143.214053] sysrq: SysRq : Power Off [ 156s] [ 143.219934] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] lamb23 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:57:06 UTC 2018. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:57:13 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:57:13 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5ba2aa3093e85_48589206801209f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] No package 'libpcsclite' found [ 160s] simtrace2-remsim.o: In function `main': [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 160s] apdu_dispatch.o: In function `apdu_segment_in': [ 160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 160s] collect2: error: ld returned 1 exit status [ 160s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 160s] make[2]: *** [simtrace2-remsim] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 160s] Makefile:20: recipe for target 'utils' failed [ 160s] make[1]: *** [utils] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: make -j1 returned exit code 2 [ 160s] debian/rules:4: recipe for target 'build' failed [ 160s] make: *** [build] Error 2 [ 160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 160s] [ 160s] lamb24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:57:08 UTC 2018. [ 160s] [ 161s] ### VM INTERACTION START ### [ 164s] [ 152.584156] sysrq: SysRq : Power Off [ 164s] [ 152.590689] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:57:12 UTC 2018. [ 164s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 19:58:05 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 19:58:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5ba2aa4f43c51_48589206801210b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 197s] No package 'libpcsclite' found [ 197s] simtrace2-remsim.o: In function `main': [ 197s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 197s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 197s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 197s] apdu_dispatch.o: In function `apdu_segment_in': [ 197s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 197s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 197s] collect2: error: ld returned 1 exit status [ 197s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 197s] make[2]: *** [simtrace2-remsim] Error 1 [ 197s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 197s] Makefile:20: recipe for target 'utils' failed [ 197s] make[1]: *** [utils] Error 2 [ 197s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 197s] dh_auto_build: make -j1 returned exit code 2 [ 197s] debian/rules:4: recipe for target 'build' failed [ 197s] make: *** [build] Error 2 [ 197s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 197s] [ 197s] lamb53 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:57:44 UTC 2018. [ 197s] [ 197s] ### VM INTERACTION START ### [ 200s] [ 187.794918] sysrq: SysRq : Power Off [ 200s] [ 187.799910] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] lamb53 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 19:57:47 UTC 2018. [ 200s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 19 21:16:56 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 19 Sep 2018 21:16:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ba2bcd55fe45_48589206801321d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 234s] No package 'libpcsclite' found [ 235s] simtrace2-remsim.o: In function `main': [ 235s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 235s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 235s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 235s] apdu_dispatch.o: In function `apdu_segment_in': [ 235s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 235s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 235s] collect2: error: ld returned 1 exit status [ 235s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 235s] make[2]: *** [simtrace2-remsim] Error 1 [ 235s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 235s] Makefile:20: recipe for target 'utils' failed [ 235s] make[1]: *** [utils] Error 2 [ 235s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 235s] dh_auto_build: make -j1 returned exit code 2 [ 235s] debian/rules:4: recipe for target 'build' failed [ 235s] make: *** [build] Error 2 [ 235s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 235s] [ 235s] armbuild21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 21:16:42 UTC 2018. [ 235s] [ 235s] ### VM INTERACTION START ### [ 238s] [ 225.593219] SysRq : Power Off [ 238s] [ 225.595201] reboot: Power down [ 238s] ### VM INTERACTION END ### [ 238s] [ 238s] armbuild21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 19 21:16:46 UTC 2018. [ 238s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu Sep 20 00:51:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Sep 2018 00:51:22 +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_#5666?= Message-ID: <1702189587.185.1537404682927.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 810.52 KB...] ^ CC RANAP_LastVisitedUTRANCell-Item.lo CC RANAP_LHN-ID.lo CC RANAP_Links-to-log.lo CC RANAP_ListOF-SNAs.lo CC RANAP_ListOfInterfacesToTrace.lo CC RANAP_InterfacesToTraceItem.lo CC RANAP_LoadValue.lo CC RANAP_LocationRelatedDataRequestType.lo CC RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.lo CC RANAP_LocationReportingTransferInformation.lo CC RANAP_ReportChangeOfSAI.lo CC RANAP_PeriodicReportingIndicator.lo CC RANAP_DirectReportingIndicator.lo CC RANAP_L3-Information.lo CC RANAP_M1Report.lo CC RANAP_M2Report.lo CC RANAP_M4Report.lo CC RANAP_M4-Collection-Parameters.lo CC RANAP_M4-Period.lo CC RANAP_M4-Threshold.lo CC RANAP_M5Report.lo CC RANAP_M5-Period.lo CC RANAP_M6Report.lo CC RANAP_M6-Period.lo CC RANAP_M7Report.lo CC RANAP_M7-Period.lo CC RANAP_Management-Based-MDT-Allowed.lo CC RANAP_MaxBitrate.lo CC RANAP_MaxSDU-Size.lo CC RANAP_MBMS-PTP-RAB-ID.lo CC RANAP_MBMSBearerServiceType.lo CC RANAP_MBMSCNDe-Registration.lo CC RANAP_MBMSCountingInformation.lo CC RANAP_MBMSHCIndicator.lo CC RANAP_MBMSIPMulticastAddressandAPNRequest.lo CC RANAP_MBMSLinkingInformation.lo CC RANAP_MBMSRegistrationRequestType.lo CC RANAP_MBMSServiceArea.lo CC RANAP_MBMSSessionDuration.lo CC RANAP_MBMSSessionIdentity.lo CC RANAP_MBMSSessionRepetitionNumber.lo CC RANAP_MDT-Activation.lo CC RANAP_MDTAreaScope.lo CC RANAP_MDT-Configuration.lo CC RANAP_MDTMode.lo CC RANAP_MDT-PLMN-List.lo CC RANAP_MDT-Report-Parameters.lo CC RANAP_MeasurementQuantity.lo CC RANAP_MeasurementsToActivate.lo CC RANAP_MSISDN.lo CC RANAP_NAS-SequenceNumber.lo CC RANAP_NAS-PDU.lo CC RANAP_NAS-SynchronisationIndicator.lo CC RANAP_NewBSS-To-OldBSS-Information.lo CC RANAP_NonSearchingIndication.lo CC RANAP_NRTLoadInformationValue.lo CC RANAP_NumberOfIuInstances.lo CC RANAP_Offload-RAB-Parameters.lo CC RANAP_NumberOfSteps.lo CC RANAP_Offload-RAB-Parameters-APN.lo CC RANAP_Offload-RAB-Parameters-ChargingCharacteristics.lo CC RANAP_OldBSS-ToNewBSS-Information.lo CC RANAP_OMC-ID.lo CC RANAP_PagingAreaID.lo CC RANAP_Out-Of-UTRAN.lo CC RANAP_PagingCause.lo CC RANAP_PDP-TypeInformation.lo CC RANAP_PDP-Type.lo CC RANAP_PDP-TypeInformation-extension.lo CC RANAP_PDP-Type-extension.lo CC RANAP_PDUType14FrameSequenceNumber.lo CC RANAP_PeriodicLocationInfo.lo CC RANAP_PermanentNAS-UE-ID.lo CC RANAP_PermittedEncryptionAlgorithms.lo CC RANAP_PermittedIntegrityProtectionAlgorithms.lo CC RANAP_LoggedMDT.lo CC RANAP_LABased.lo CC RANAP_LAI-List.lo CC RANAP_LoggingInterval.lo CC RANAP_LoggingDuration.lo CC RANAP_PLMNidentity.lo CC RANAP_PLMNs-in-shared-network.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from RANAP_PLMNs-in-shared-network.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: 'struct MemberA' declared inside parameter list A_SEQUENCE_OF(struct MemberA { ^ /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_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberA { ^ /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_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 A_SEQUENCE_OF(struct MemberM { ^ /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_PLMNs-in-shared-network.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberM { ^ CC RANAP_Port-Number.lo CC RANAP_PositioningDataDiscriminator.lo CC RANAP_PositioningDataSet.lo CC RANAP_PositioningMethodAndUsage.lo CC RANAP_PositioningPriority.lo CC RANAP_PositionData.lo CC RANAP_PositionDataSpecificToGERANIuMode.lo CC RANAP_Pre-emptionCapability.lo CC RANAP_Pre-emptionVulnerability.lo CC RANAP_PriorityLevel.lo CC RANAP_Priority-Class-Indicator.lo CC RANAP_ProvidedData.lo CC RANAP_P-TMSI.lo CC RANAP_QueuingAllowed.lo CC RANAP_RAB-AsymmetryIndicator.lo CC RANAP_RABased.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from ../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14, from ../../include/osmocom/ranap/RANAP_ProvidedData.h:14, from RANAP_ProvidedData.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: 'struct MemberA' declared inside parameter list A_SEQUENCE_OF(struct MemberA { ^ /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_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberA { ^ /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_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 A_SEQUENCE_OF(struct MemberM { ^ /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_PLMNs-in-shared-network.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberM { ^ CC RANAP_RAI-List.lo CC RANAP_RABDataVolumeReport.lo CC RANAP_RAB-ID.lo CC RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_RAB-Parameter-MaxBitrateList.lo CC RANAP_RAB-Parameters.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:14, from RANAP_RABDataVolumeReport.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: 'struct MemberN' declared inside parameter list A_SEQUENCE_OF(struct MemberN { ^ /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_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberN { ^ /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_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ CC RANAP_RABParametersList.lo CC RANAP_RAB-SubflowCombinationBitRate.lo CC RANAP_RAB-TrCH-Mapping.lo CC RANAP_RAB-TrCH-MappingItem.lo CC RANAP_RAI.lo CC RANAP_RAC.lo CC RANAP_RAListofIdleModeUEs.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from RANAP_RABParametersList.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: 'struct MemberN' declared inside parameter list A_SEQUENCE_OF(struct MemberN { ^ /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_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberN { ^ /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_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: 'struct MemberB' declared inside parameter list A_SEQUENCE_OF(struct MemberB { ^ /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_RABParametersList.h:29:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberB { ^ CC RANAP_NotEmptyRAListofIdleModeUEs.lo gcc: internal compiler error: Segmentation fault (program as) Please submit a full bug report, with preprocessed source if appropriate. See for instructions. Makefile:2495: recipe for target 'RANAP_RAB-SubflowCombinationBitRate.lo' failed make[4]: *** [RANAP_RAB-SubflowCombinationBitRate.lo] Error 1 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory '/build/deps/osmo-iuh/src/ranap' Makefile:631: recipe for target 'install-recursive' failed make[3]: Leaving directory '/build/deps/osmo-iuh/src' make[3]: *** [install-recursive] Error 1 Makefile:790: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/osmo-iuh/src' make[2]: *** [install] Error 2 Makefile:446: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-iuh' make[1]: *** [install-recursive] Error 1 Makefile:745: 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 Thu Sep 20 00:57:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Sep 2018 00:57:02 +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_#5667?= In-Reply-To: <1702189587.185.1537404682927.JavaMail.jenkins@jenkins.osmocom.org> References: <1702189587.185.1537404682927.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <488278103.186.1537405022877.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Sep 20 07:02:56 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 20 Sep 2018 07:02:56 +0000 Subject: Change in pysim[master]: tests: add example test data for Wavemobile-SIM Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11036 Change subject: tests: add example test data for Wavemobile-SIM ...................................................................... tests: add example test data for Wavemobile-SIM Change-Id: If69cd2d8af6d544155b3088f77eb6ea4b789901d Related: SYS#4245 --- A tests/Wavemobile-SIM.data.example 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/11036/1 diff --git a/tests/Wavemobile-SIM.data.example b/tests/Wavemobile-SIM.data.example new file mode 100644 index 0000000..e9ba965 --- /dev/null +++ b/tests/Wavemobile-SIM.data.example @@ -0,0 +1,5 @@ +MCC=001 +MNC=01 +IMSI=001010000000102 +ADM=0123456789ABCDEF + -- To view, visit https://gerrit.osmocom.org/11036 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: If69cd2d8af6d544155b3088f77eb6ea4b789901d Gerrit-Change-Number: 11036 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 08:10:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 08:10:49 +0000 Subject: Change in osmo-ci[master]: osmocom-debian-install.yml: new jenkins jobs In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11031 ) Change subject: osmocom-debian-install.yml: new jenkins jobs ...................................................................... osmocom-debian-install.yml: new jenkins jobs Installs most packages from the Osmocom Debian repository into a plain debian:stretch container and call the osmo-* binaries with --version (or -h). Two jobs, one for nightly and one for latest. Change-Id: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Related: OS#3176 --- A jobs/osmocom-debian-install.yml 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jobs/osmocom-debian-install.yml b/jobs/osmocom-debian-install.yml new file mode 100644 index 0000000..823db3c --- /dev/null +++ b/jobs/osmocom-debian-install.yml @@ -0,0 +1,30 @@ +--- +- project: + name: Osmocom-Debian-install + jobs: + - Osmocom-Debian-install-{type} + type: + - nightly + - latest + +- job-template: + name: 'Osmocom-Debian-install-{type}' + + project-type: freestyle + defaults: global + description: 'Generated by job-builder' + node: osmocom-master-debian9 + builders: + - shell: + cd debian-repo-install-test && FEED={type} ./jenkins.sh + scm: + - git: + branches: + - '*/master' + url: git://git.osmocom.org/docker-playground + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + triggers: + - timed: "@midnight" + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/11031 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: Idbb43ed737e164f8cf3a0e085ed54e4c6a2d14bc Gerrit-Change-Number: 11031 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 08:11:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 08:11:44 +0000 Subject: Change in osmo-ci[master]: gitignore: add __pycache__ In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11032 ) Change subject: gitignore: add __pycache__ ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11032 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: Ic8fb08fec1629846fc0712d6bc0b6288fbba7dc9 Gerrit-Change-Number: 11032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 08:11:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 08:11:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 08:11:47 +0000 Subject: Change in osmo-ci[master]: gitignore: add __pycache__ In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11032 ) Change subject: gitignore: add __pycache__ ...................................................................... gitignore: add __pycache__ The osmo-depcheck script consists of multiple Python files. Python creates a __pycache__ folder, so let's make sure that does not get added by accident into the git repository. Related: OS#2642 Change-Id: Ic8fb08fec1629846fc0712d6bc0b6288fbba7dc9 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/.gitignore b/.gitignore index 07c4349..1717928 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .*.sw? jenkins_jobs.ini jenkins-jobs.ini +__pycache__/ -- To view, visit https://gerrit.osmocom.org/11032 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: Ic8fb08fec1629846fc0712d6bc0b6288fbba7dc9 Gerrit-Change-Number: 11032 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 09:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 09:21:30 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add jenkins-build-osmo-iuh.sh In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11026 ) Change subject: contrib: Add jenkins-build-osmo-iuh.sh ...................................................................... contrib: Add jenkins-build-osmo-iuh.sh Change-Id: I75cb9551db6b1b4aa5bfb76177694c14fad82f04 --- A contrib/jenkins-build-osmo-iuh.sh 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-iuh.sh new file mode 100755 index 0000000..03295f9 --- /dev/null +++ b/contrib/jenkins-build-osmo-iuh.sh @@ -0,0 +1,15 @@ +#!/bin/sh +set -e -x +base="$PWD" +name="osmo-iuh" +. "$(dirname "$0")/jenkins-build-common.sh" + +build_repo libosmocore --enable-sanitize --disable-doxygen +build_repo libosmo-abis --enable-sanitize +build_repo libosmo-netif --enable-sanitize --disable-doxygen +build_repo libosmo-sccp --enable-sanitize +build_repo libasn1c --enable-sanitize + +build_repo osmo-iuh --enable-sanitize + +create_bin_tgz "osmo-hnbgw" -- To view, visit https://gerrit.osmocom.org/11026 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: I75cb9551db6b1b4aa5bfb76177694c14fad82f04 Gerrit-Change-Number: 11026 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 Sep 20 09:21:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Sep 2018 09:21:31 +0000 Subject: Change in osmo-trx[master]: device/lms/LMSDevice.cpp: fix compilation warning Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11037 Change subject: device/lms/LMSDevice.cpp: fix compilation warning ...................................................................... device/lms/LMSDevice.cpp: fix compilation warning The following warning was observed with GCC 4.8.5: make[4]: Entering directory `.../osmo-trx/Transceiver52M/device/lms' CXX LMSDevice.lo LMSDevice.cpp: In member function 'LMSDevice::writeSamples()': LMSDevice.cpp:582:22: warning: 'rc' may be used uninitialized in this function [-Wmaybe-uninitialized] samplesWritten += rc; Let's fix this by zero-initializing 'rc'. Change-Id: I4b4a061fc12e5fd1db8d1087d8e0c46ff1e23412 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/37/11037/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index d8220ea..32c3d15 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -543,7 +543,7 @@ bool * underrun, unsigned long long timestamp, bool isControl) { - int rc; + int rc = 0; unsigned int i; lms_stream_status_t status; lms_stream_meta_t tx_metadata = {}; -- To view, visit https://gerrit.osmocom.org/11037 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: I4b4a061fc12e5fd1db8d1087d8e0c46ff1e23412 Gerrit-Change-Number: 11037 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 09:26:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 09:26:20 +0000 Subject: Change in osmo-trx[master]: device/lms/LMSDevice.cpp: fix compilation warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11037 ) Change subject: device/lms/LMSDevice.cpp: fix compilation warning ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11037 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: I4b4a061fc12e5fd1db8d1087d8e0c46ff1e23412 Gerrit-Change-Number: 11037 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Sep 2018 09:26:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 09:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 09:26:43 +0000 Subject: Change in osmo-trx[master]: device/lms/LMSDevice.cpp: fix compilation warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11037 ) Change subject: device/lms/LMSDevice.cpp: fix compilation warning ...................................................................... device/lms/LMSDevice.cpp: fix compilation warning The following warning was observed with GCC 4.8.5: make[4]: Entering directory `.../osmo-trx/Transceiver52M/device/lms' CXX LMSDevice.lo LMSDevice.cpp: In member function 'LMSDevice::writeSamples()': LMSDevice.cpp:582:22: warning: 'rc' may be used uninitialized in this function [-Wmaybe-uninitialized] samplesWritten += rc; Let's fix this by zero-initializing 'rc'. Change-Id: I4b4a061fc12e5fd1db8d1087d8e0c46ff1e23412 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index d8220ea..32c3d15 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -543,7 +543,7 @@ bool * underrun, unsigned long long timestamp, bool isControl) { - int rc; + int rc = 0; unsigned int i; lms_stream_status_t status; lms_stream_meta_t tx_metadata = {}; -- To view, visit https://gerrit.osmocom.org/11037 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: I4b4a061fc12e5fd1db8d1087d8e0c46ff1e23412 Gerrit-Change-Number: 11037 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 20 09:27:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 09:27:22 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verifica... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11038 Change subject: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification ...................................................................... jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification Recently in osmo-gsm-tester some suite names were changed to have better unified naming. As a result, some of the suites used here need to updated. Change-Id: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a --- M jobs/osmo-gsm-tester_run-gerrit.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/38/11038/1 diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh b/jobs/osmo-gsm-tester_run-gerrit.sh index 6d33490..4f250be 100644 --- a/jobs/osmo-gsm-tester_run-gerrit.sh +++ b/jobs/osmo-gsm-tester_run-gerrit.sh @@ -10,5 +10,5 @@ unlink osmo-gsm-tester/example/resources.conf || true ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf -export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo" +export OSMO_GSM_TESTER_OPTS="-s nitb_sms:sysmo -s sms:sysmo -s gprs:sysmo" ./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh -- To view, visit https://gerrit.osmocom.org/11038 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: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a Gerrit-Change-Number: 11038 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 Sep 20 11:15:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 11:15:35 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 2: > Please make sure that work directories are properly cleaned up after a build so we don't waste tons of disks space. The installation folders are properly cleaned up (with atexit). The sources get downloaded into the Jenkins workspace folder, which means they get automatically deleted by Jenkins as soon as the next job starts, right? -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 11:15:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 12:35:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 20 Sep 2018 12:35:58 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Build osmo-msc with IU support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11027 ) Change subject: contrib: Build osmo-msc with IU support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11027 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: I68503ae2f27948aff60a9424e6b114db548d79e9 Gerrit-Change-Number: 11027 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 20 Sep 2018 12:35: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 Sep 20 12:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 20 Sep 2018 12:36:04 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Build osmo-sgsn with IU support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11028 ) Change subject: contrib: Build osmo-sgsn with IU support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11028 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: I810ae848c350550430c1918b3abb4376d21d7317 Gerrit-Change-Number: 11028 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 20 Sep 2018 12:36: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 Sep 20 12:43:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 20 Sep 2018 12:43:36 +0000 Subject: Change in pysim[master]: tests: add example test data for Wavemobile-SIM In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11036 ) Change subject: tests: add example test data for Wavemobile-SIM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11036 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: If69cd2d8af6d544155b3088f77eb6ea4b789901d Gerrit-Change-Number: 11036 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 20 Sep 2018 12:43: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 Sep 20 12:43:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 20 Sep 2018 12:43:38 +0000 Subject: Change in pysim[master]: tests: add example test data for Wavemobile-SIM In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11036 ) Change subject: tests: add example test data for Wavemobile-SIM ...................................................................... tests: add example test data for Wavemobile-SIM Change-Id: If69cd2d8af6d544155b3088f77eb6ea4b789901d Related: SYS#4245 --- A tests/Wavemobile-SIM.data.example 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/Wavemobile-SIM.data.example b/tests/Wavemobile-SIM.data.example new file mode 100644 index 0000000..e9ba965 --- /dev/null +++ b/tests/Wavemobile-SIM.data.example @@ -0,0 +1,5 @@ +MCC=001 +MNC=01 +IMSI=001010000000102 +ADM=0123456789ABCDEF + -- To view, visit https://gerrit.osmocom.org/11036 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: If69cd2d8af6d544155b3088f77eb6ea4b789901d Gerrit-Change-Number: 11036 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 Sep 20 12:52:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 12:52:36 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10932 to look at the new patch set (#3). Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... osmo-depcheck: script to verify PKG_CHECK_MODULES This script verifies that Osomcom programs really build with the dependency versions they claim to support in configure.ac. In order to do that, it clones the dependency repositories if they don't exist already, and checks out the minimum version tag. This happens recursively for their dependencies as well. See 'osmo-depcheck.py -h' for the full usage instructions. There's also a new jenkins job in jobs/osmocom-depcheck.yml. Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65 Relates: OS#2642 --- A jobs/osmocom-depcheck.yml A scripts/osmo-depcheck/buildstack.py A scripts/osmo-depcheck/config.py A scripts/osmo-depcheck/dependencies.py A scripts/osmo-depcheck/osmo-depcheck.py A scripts/osmo-depcheck/parse.py 6 files changed, 586 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/10932/3 -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 12:53:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 12:53:28 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Build osmo-msc with IU support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11027 ) Change subject: contrib: Build osmo-msc with IU support ...................................................................... contrib: Build osmo-msc with IU support Change-Id: I68503ae2f27948aff60a9424e6b114db548d79e9 --- M contrib/jenkins-build-osmo-msc.sh 1 file changed, 3 insertions(+), 1 deletion(-) 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 5b5d1f6..b614052 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -11,6 +11,8 @@ 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 +build_repo libasn1c --enable-sanitize +build_repo osmo-iuh --enable-sanitize +build_repo osmo-msc --enable-sanitize --enable-smpp --enable-iu create_bin_tgz osmo-msc -- To view, visit https://gerrit.osmocom.org/11027 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: I68503ae2f27948aff60a9424e6b114db548d79e9 Gerrit-Change-Number: 11027 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 Sep 20 12:53:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 12:53:29 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Build osmo-sgsn with IU support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11028 ) Change subject: contrib: Build osmo-sgsn with IU support ...................................................................... contrib: Build osmo-sgsn with IU support Change-Id: I810ae848c350550430c1918b3abb4376d21d7317 --- M contrib/jenkins-build-osmo-sgsn.sh 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index 4a23b33..87aed76 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -9,6 +9,8 @@ build_repo libosmo-netif --enable-sanitize --disable-doxygen build_repo libosmo-sccp --enable-sanitize build_repo osmo-ggsn --enable-sanitize -build_repo osmo-sgsn --enable-sanitize --disable-iu +build_repo libasn1c --enable-sanitize +build_repo osmo-iuh --enable-sanitize +build_repo osmo-sgsn --enable-sanitize --enable-iu create_bin_tgz osmo-sgsn -- To view, visit https://gerrit.osmocom.org/11028 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: I810ae848c350550430c1918b3abb4376d21d7317 Gerrit-Change-Number: 11028 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 Sep 20 12:55:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 12:55:39 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 3: Verified+1 (19 comments) > In general: in some places I think the overall design could be simpler and much shorter, but the coding style is clear and mature, and I'm looking forward to more patches from you. Thank you for the detailed review! > So yes, in the end, let's see a run in jenkins as Harald said :) https://jenkins.osmocom.org/jenkins/job/Osmocom-depcheck (check out the new configurable build parameters!) https://gerrit.osmocom.org/#/c/10932/2/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/10932/2/.gitignore at 8 PS2, Line 8: __pycache__/ > technically this would be a separate patch from the rest Submitted and merged here: https://gerrit.osmocom.org/#/c/osmo-ci/+/11032/ https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py File scripts/osmo-depcheck/buildstack.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 2 PS2, Line 2: # Copyright 2018 sysmocom - s.f.m.c. GmbH > (You should write "Copyright ...", the (c) is just a gimmick IIUC. [?] fixed in the upcoming patch https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 11 PS2, Line 11: > Generally, this file reads like a re-invention of the GNU Make wheel... make? never heard of that :p But seriously: now that you say it, I could have probably replaced "next()", "generate()", "print_dict()", set_environment()" and "build()" with writing a Makefile, and then let make do the resolving and execute the commands. I am not sure if it would have been possible to generate a nice overview of the build order as written below (but then again, this was never asked for). So I'll consider this in the future, if there's a similar situation. Thanks for the hint! --- Build order: * libosmocore:0.11.0 * libosmo-abis:0.5.0 * osmo-hlr:0.2.1 https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 13 PS2, Line 13: def next_buildable(depends, done): > some of the function names here read like generic tools, I think more concise names would help reada [?] Replaced "next()" with "next_buildable()" in the next patchset. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 20 PS2, Line 20: :param done: ordered dict of programs that would already have been > it's actually an ordered dict, not a list good catch! fixed in the upcoming patchset https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 50 PS2, Line 50: :param depends: return value of dependencies.generate() > (an *ordered* dict) +1 https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 65 PS2, Line 65: def print_dict(stack): > oh, so now it's a stack? .. [?] Well, the file is called "buildstack.py", so that ordered dict *is* the stack. There's no stack datatype in Python 3 from what I found, so I don't get why this is confusing :p https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 80 PS2, Line 80: :returns: the path to the temporary folder """ > (maybe a separator [. [?] Ack https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 95 PS2, Line 95: "LD_LIBRARY_PATH": tempdir + "/lib"} > (would be more readable: [?] I'll change this to env_var, folder (so I don't overwrite "tempdir" which is already used above). https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 97 PS2, Line 97: old = os.environ[env_var] if env_var in os.environ else "" > if 'old' is empty, you end up producing ":new_dir". A neat trick in these cases is join: [?] Nice trick, but that seems to be a bit over-engineered here IMHO. ":path" will work just as well. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 134 PS2, Line 134: # Run the build commands > hmm, do we need specific configure options sometimes? --with-systemdsystemunitdir was also needed, besides that it worked for all programs I have tested without any additional parameters. On demand we could still add a mapping in config.py for repositories and the special configure parameters they need. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py File scripts/osmo-depcheck/config.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py at 10 PS2, Line 10: "osmo-hlr", > indicate whether it's regex or shell glob or ... Ack https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py at 18 PS2, Line 18: # they are mentioned with PKG_CHECK_MODULES in configure.ac. > would make sense to use tuples instead of lists -- they aren't supposed to be mutable, right? [?] Good point with the tuples. Regarding the lists, I built them that way so they follow PEP8 (so I can run "flake8" on it without disabling anything). If you say it's not that important, then I'll keep it that way for now. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py File scripts/osmo-depcheck/dependencies.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 14 PS2, Line 14: """ Clone a missing git repository and checkout a specific version tag. > clone() vs. [?] Ack https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 20 PS2, Line 20: # Clone when needed > This function reads like a re-invention of the osmo-build-dep. [?] Well, this is a pretty short function (14 LOC), and it does have a few key differences: * explain that config.py needs to be adjusted when git clone fails * silent output unless an error happens (and this is kind of important here, otherwise the resulting output of the dependency list would not be readable at all) * (in the upcoming patchset) allow a different git url prefix, as requested by @pespin Also I saw osmo-build-dep.sh and osmo-deps.sh and briefly looked at them, but they did not have a description on top of them indicating that they could be used elsewhere. I thought that they were part of some internal code somewhere. That might be a good improvement? https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/osmo-depcheck.py File scripts/osmo-depcheck/osmo-depcheck.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/osmo-depcheck.py at 59 PS2, Line 59: ret = parser.parse_args() > This script could just do what it does, does it really need to know that it is running in docker / s [?] The idea here was to make it convenient to run everything in docker by adding "-d" to the command line. But it turned out, that there's no advantage of running this in docker anyway (see the redmine issue), so I've removed all docker related code in the next patchset. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/osmo-depcheck.py at 74 PS2, Line 74: project, rev = project_rev.split(":", 1) > the (ugly) python paradigm would be [?] Ack https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py File scripts/osmo-depcheck/parse.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py at 18 PS2, Line 18: def repository(library, version): > version has nothing to do with this function, does it? This is needed for printing purposes (see below). Mixing the printing part and the part which actually retrieves the repository is a bit unclean, I know. But if we would split that up in two functions (one extra function for printing), we would probably have the double amount of LOC here. This wouldn't be a better tradeoff in my opinion. My take on this would be refactoring it if it grows bigger. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/parse.py at 80 PS2, Line 80: return (library, version) > py fu: [?] nice, thanks! :D -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 12:55:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 13:04:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 13:04:40 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Create a common chapter for section documenting backends Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11039 Change subject: osmotrx: Create a common chapter for section documenting backends ...................................................................... osmotrx: Create a common chapter for section documenting backends Change-Id: I6bea1ccca4ce72b92641a36f9f5894ac9a6cae72 --- M OsmoTRX/chapters/trx-backends.adoc 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/39/11039/1 diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc index e801886..8829fa6 100644 --- a/OsmoTRX/chapters/trx-backends.adoc +++ b/OsmoTRX/chapters/trx-backends.adoc @@ -1,5 +1,8 @@ +[[trx_backends]] +== OsmoTRX backend support + [[backend_uhd]] -== `osmo-trx-uhd` for UHD based Transceivers +=== `osmo-trx-uhd` for UHD based Transceivers This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the device, that is configuring it and reading/writing samples from/to it. @@ -17,7 +20,7 @@ _osmo-trx.git_. [[backend_lms]] -== `osmo-trx-lms` for LimeSuite based Transceivers +=== `osmo-trx-lms` for LimeSuite based Transceivers This OsmoTRX model uses LimeSuite API and library to drive the device, that is configuring it and reading/writing samples from/to it. @@ -30,7 +33,7 @@ _osmo-trx.git_. [[backend_usrp1]] -== `osmo-trx-usrp1` for libusrp based Transceivers +=== `osmo-trx-usrp1` for libusrp based Transceivers This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2. -- To view, visit https://gerrit.osmocom.org/11039 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: I6bea1ccca4ce72b92641a36f9f5894ac9a6cae72 Gerrit-Change-Number: 11039 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 Sep 20 13:04:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 13:04:40 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Introduce code architecture chapter Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11040 Change subject: osmotrx: Introduce code architecture chapter ...................................................................... osmotrx: Introduce code architecture chapter Change-Id: I21084e6315d79a1adcb305e12343da218837dc31 --- A OsmoTRX/chapters/code-architecture.adoc M OsmoTRX/osmotrx-usermanual.adoc M common/chapters/trx_if.adoc 3 files changed, 145 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/40/11040/1 diff --git a/OsmoTRX/chapters/code-architecture.adoc b/OsmoTRX/chapters/code-architecture.adoc new file mode 100644 index 0000000..18d0e3a --- /dev/null +++ b/OsmoTRX/chapters/code-architecture.adoc @@ -0,0 +1,141 @@ +[[code_architecture]] +== Code Architecture + +[[fig-code-architecture-general]] +.General overview of main OsmoTRX components +[graphviz] +---- +digraph hierarchy { +node[shape=record,style=filled,fillcolor=gray95] +edge[dir=back, arrowtail=empty] + +2[label = "{Transceiver|+ constructor()\l+ destructor()\l+ init()\l+ numChans()\l+ receiveFIFO()\l+ setSignalHandler()}"] +3[label = "{RadioInterface|...}"] +4[label = "{RadioInterfaceResamp|...}"] +5[label = "{RadioInterfaceMulti|...}"] +6[label = "{RadioDevice|...}"] +7[label = "{UHDDevice|...}"] +8[label = "{LMSDevice|...}"] +9[label = "{USRPDevice|...}"] + +2->3[arrowtail=odiamond] +3->4[constraint=false] +3->5[constraint=false] +3->6[arrowtail=odiamond] +6->7 +6->8 +6->9 +} +---- + +[[fig-code-architecture-threads]] +.Example of thread architecture with OsmoTRX configured to use 2 logical RF channels (Trx=Transceiver, RI=RadioIface) +[graphviz] +---- +digraph hierarchy { +node[shape=record,style=filled,fillcolor=gray95] + +trans [label="Transceiver"]; +radioiface [label="RadioInterface"]; +radiodev [label="RadioDevice"]; + +trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"]; +trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"]; +trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"]; +trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"]; +radioiface:e->trans:e [label="Trx.RxServiceLoop_0"]; +radioiface:e->trans:e [label="Trx.RxServiceLoop_1"]; +radioiface->radiodev[label="RI.AlignRadioServiceLoop"]; +radioiface:sw->radiodev:nw [label="Trx.TxLowerLoop"]; +radiodev:ne->radioiface:se [label="Trx.RxLowerLoop"]; +} +---- + +[[code_component_transceiver]] +=== Transceiver + +The Transceiver is the main component managing the other components running in +the OsmoTRX process. There's a unique instance per process. + +This class is quite complex from code point of view, as it starts lots of +different threads and hence the interaction with this class from the outside is +quite limited. Only interaction possible is to: + +* `Transceiver()`: Create an instance through its constructor, at this time most + configuration is handed to it. +* `init()`: Start running all the threads. +* `receiveFIFO()`: Attach a `radioInterface` channel FIFO in order to use it. +* `setSignalHandler()`: Used to set up a callback to receive certain events + asynchronously from the Transceiver. No assumptions can be made about from + which thread is the callback being called, which means multi-thread locking + precautions may be required in certain cases, similar to usual signal handler + processing. One important event received through this path is for instance + when the Transceiver detected a fatal error which requires it to stop. Since + it cannot stop itself (see destructor below), stopping procedure must be + delegated to the user who created the instance. +* `~Transceiver()`: The destructor, which stops all running threads created at + `init()` time. Destroying the object is the only way to stop the `Transceiver` + completely, and must be called from a thread not managed by the + `Transceiver`, otherwise it will deadlock. Usually it is stopped from the main + thread, the one that called the constructor during startup. + +During `init()` time, `Transceiver` will create a noticeable amount of threads, +which may vary depending on the amount of RF channels requested. + +Static amount of Threads (1 per `Transceiver` instance): + +* `RxLowerLoop`: This thread is responsible for reading bursts from the + `RadioInterface`, storing them into its FIFO and sending Clock Indications + (<>) to _osmo-bts_trx_. +* `TxLowerLoop`: Manages pushing bursts from buffers in the FIFO into the + `RadioInterface` at expected correct time based on the Transceiver clock. + +Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance): + +* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface + socket (<>). Each thread is responsible for managing one + socket related to one ARFCN or which is the same, to one RF logical channel. + These are the only threads expected to use the private `start()` and `stop()` + methods of the `Transceiver()` class, since those methods don't stop any of + the `ControlServiceLoop` threads as they must keep running to handle new + commands (for instance, to re-start processing samples with the _POWERON_ + command). +* `RxServiceLoop`: Each thread of this type pulls bursts from the + `RadioInterface` FIFO for one specific logical RF channel and handles it + according to the slot and burst correlation type, finally sending proper data + over the TRX Manager UDP socket (<>). +* `TxPriorityQueueServiceLoop`: Blocks reading from one ARFCN specific TRX + Manager UDP socket (<>), and fills the `RadioInterface` with it + setting clock related information. + +[[code_component_radioiface]] +=== RadioInterface + +The `RadioInterface` sits between the `Transceiver` and the `RadioDevice`, and +provides extra features to the pipe like channelizers, resamplers, Tx/Rx +synchronization on some devices, etc. + +If the `RadioDevice` it drives requires it (only _USRP1_ so far), the +`RadioIntercace` will start and manage a thread internally called +`AlignRadioServiceLoop` which will align current RX and TX timestamps. + +Different features are offered through different `RadioInterface` subclasses +which are selected based on configuration and device detected at runtime. Using +these features may impact on the amount of CPU required to run the entire pipe. + +==== RadioInterfaceResamp + +This subclass of `RadioInterface` is automatically selected when some known +specific UHD are to be used, since they require resampling to work properly. +Some of this devices are for instance Ettus B100, USRP2 and X3XX models. + +==== RadioInterfaceMulti + +This subclass of `RadioInterface` is used when <> is requested. + +[[code_component_radiodev]] +=== RadioDevice + +The `RadioDevice` class is responsible for driving the actual Hardware device. +It is actually only an interface, and it is implemented in each backend which in +turn becomes a specific OsmoTRX binary, see <>. diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index a713e4a..14f5514 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -29,6 +29,8 @@ include::chapters/trx-backends.adoc[] +include::chapters/code-architecture.adoc[] + include::../common/chapters/trx_if.adoc[] include::../common/chapters/port_numbers.adoc[] diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 4fb8f9b..b684b7b 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -11,6 +11,7 @@ every socket is at P+100. For any given build, the number of ARFCN interfaces can be fixed. +[[trx_if_clock_ind]] === Indications on the Master Clock Interface The master clock interface is output only (from the radio). @@ -24,6 +25,7 @@ IND CLOCK ---- +[[trx_if_control]] === Commands on the Per-ARFCN Control Interface The per-ARFCN control interface uses a command-reponse protocol. Commands are -- To view, visit https://gerrit.osmocom.org/11040 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: I21084e6315d79a1adcb305e12343da218837dc31 Gerrit-Change-Number: 11040 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 Sep 20 13:31:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 13:31:43 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10932 to look at the new patch set (#4). Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... osmo-depcheck: script to verify PKG_CHECK_MODULES This script verifies that Osomcom programs really build with the dependency versions they claim to support in configure.ac. In order to do that, it clones the dependency repositories if they don't exist already, and checks out the minimum version tag. This happens recursively for their dependencies as well. See 'osmo-depcheck.py -h' for the full usage instructions. There's also a new jenkins job in jobs/osmocom-depcheck.yml. Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65 Relates: OS#2642 --- A jobs/osmocom-depcheck.yml A scripts/osmo-depcheck/buildstack.py A scripts/osmo-depcheck/config.py A scripts/osmo-depcheck/dependencies.py A scripts/osmo-depcheck/osmo-depcheck.py A scripts/osmo-depcheck/parse.py 6 files changed, 584 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/10932/4 -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 14:09:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 14:09:40 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11041 Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... debian-repo-install-test: UNKNOWN in --version? With this patch, the debian-repo-install-test script checks if the Osmocom programs as installed from the Debian repository have "UNKNOWN" in their --version output. Relates: OS#3555 Change-Id: I46f18dc86d3e257c772a6db8539027aad26e24a8 --- M debian-repo-install-test/testdata/repo-install-test.sh 1 file changed, 36 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/11041/1 diff --git a/debian-repo-install-test/testdata/repo-install-test.sh b/debian-repo-install-test/testdata/repo-install-test.sh index ea1c5fb..fdd0e3e 100755 --- a/debian-repo-install-test/testdata/repo-install-test.sh +++ b/debian-repo-install-test/testdata/repo-install-test.sh @@ -44,25 +44,48 @@ apt install -y $(cat /data/osmocom_packages.txt) } +test_binaries_version() { + # Make sure --version runs and does not output UNKNOWN + failed="" + for program in $@; do + # Make sure it runs at all + $program --version + + # Check for UNKNOWN + if $program --version | grep -q UNKNOWN; then + failed="$failed $program" + echo "ERROR: this program had UNKNOWN in --version!" + fi + done + + if [ -n "$failed" ]; then + echo "ERROR: the following program(s) had UNKNOWN in --version:" + echo "$failed" + return 1 + fi +} + test_binaries() { # Make sure the binaries are not broken (run -h or --version) - osmo-bsc --version - osmo-bts-trx --version - osmo-bts-virtual --version - osmo-gbproxy --version - osmo-ggsn --version osmo-gtphub -h - osmo-hlr --version - osmo-hlr-db-tool --version - osmo-hnbgw --version - osmo-mgw --version - osmo-msc --version - osmo-pcu --version - osmo-sgsn --version osmo-sip-connector -h - osmo-stp --version osmo-trx-uhd -h osmo-trx-usrp1 -h + + test_binaries_version \ + osmo-bsc \ + osmo-bts-trx \ + osmo-bts-virtual \ + osmo-gbproxy \ + osmo-ggsn \ + osmo-hlr \ + osmo-hlr-db-tool \ + osmo-hnbgw \ + osmo-mgw \ + osmo-msc \ + osmo-pcu \ + osmo-sgsn \ + osmo-stp } finish() { -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 14:13:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 14:13:31 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11041 ) Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... Patch Set 1: Verified+1 Tested locally with nightly and latest. Nightly does not have UNKNOWN in their version string, but latest does (how useful for testing this patch!). --- output from latest: + echo ERROR: the following program(s) had UNKNOWN in --version: ERROR: the following program(s) had UNKNOWN in --version: + echo osmo-bsc osmo-gbproxy osmo-hlr osmo-hlr-db-tool osmo-msc osmo-sgsn osmo-bsc osmo-gbproxy osmo-hlr osmo-hlr-db-tool osmo-msc osmo-sgsn -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 14:13: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 Sep 20 14:28:59 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 20 Sep 2018 14:28:59 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10932 to look at the new patch set (#5). Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... osmo-depcheck: script to verify PKG_CHECK_MODULES This script verifies that Osomcom programs really build with the dependency versions they claim to support in configure.ac. In order to do that, it clones the dependency repositories if they don't exist already, and checks out the minimum version tag. This happens recursively for their dependencies as well. See 'osmo-depcheck.py -h' for the full usage instructions. There's also a new jenkins job in jobs/osmocom-depcheck.yml. Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65 Relates: OS#2642 --- A jobs/osmocom-depcheck.yml A scripts/osmo-depcheck/buildstack.py A scripts/osmo-depcheck/config.py A scripts/osmo-depcheck/dependencies.py A scripts/osmo-depcheck/osmo-depcheck.py A scripts/osmo-depcheck/parse.py 6 files changed, 590 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/10932/5 -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:03:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:03:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9674 ) Change subject: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/9674 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: Id22852d4be7f127d827e7a8beeec55db27c07f03 Gerrit-Change-Number: 9674 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 20 Sep 2018 15:03:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:04:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:04:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc 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/9674 to look at the new patch set (#7). Change subject: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc ...................................................................... bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc Add f_gen_handover_req() like f_gen_ass_req(), to match AoIP or SCCPlite requirements. For incoming HO, MSC_ConnHdlr needs to know the SCCP addresses to expect the incoming SCCP Connection from MSC to BSC. Add 'handover' section to TestHdlrParams, and pass in the addresses from test_CT via that. In osmo-bsc.cfg, add a remote neighbor config, so that the VTY command 'handover any to arfcn 123 bsic any' can trigger an outgoing inter-BSC HO. Add various BSSMAP handover templates to BSSMAP_Templates.ttcn. Add RR Ho Command template to L3_Templates.ttcn. Move ts_BSSAP_Conn_Req() from msc/BSC_ConnectionHandler.ttcn to library/BSSMAP_Emulation.ttcn, so we can also model an SCCP Connection Request in BSC_Tests.ttcn (this time from MSC to BSC). Add the two new tests to bsc/expected-results.xml. Related: OS#2283 Change-Id: Id22852d4be7f127d827e7a8beeec55db27c07f03 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M bsc/expected-results.xml M bsc/osmo-bsc.cfg M library/BSSMAP_Emulation.ttcn M library/BSSMAP_Templates.ttcn M library/L3_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn 8 files changed, 400 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/9674/7 -- To view, visit https://gerrit.osmocom.org/9674 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: Id22852d4be7f127d827e7a8beeec55db27c07f03 Gerrit-Change-Number: 9674 Gerrit-PatchSet: 7 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 Sep 20 15:07:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:07:54 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11042 Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... osmo-bsc.cfg: inter-bsc HO: add a neighbor identity This mirrors osmo-ttcn3-hacks change: "bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc" change-id Id22852d4be7f127d827e7a8beeec55db27c07f03 Related: OS#2283 Change-Id: I077c2ad2ede900ec43f55655bd740651d3bbe83d --- M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/42/11042/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 5255127..876f960 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -93,6 +93,8 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 + # remote-BSS neighbor: + neighbor add lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 858aa50..0c62104 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -103,6 +103,8 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 + # remote-BSS neighbor: + neighbor add lac 99 arfcn 123 bsic any codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:08:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:08:15 +0000 Subject: Change in docker-playground[master]: root Makefile: add rules for ttcn3-hlr-test Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11043 Change subject: root Makefile: add rules for ttcn3-hlr-test ...................................................................... root Makefile: add rules for ttcn3-hlr-test Change-Id: Idfd59c3faabeaa1af00df988513d5574c680a3bb --- M Makefile 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/11043/1 diff --git a/Makefile b/Makefile index f82e3f5..e224274 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,10 @@ osmo-ggsn-master: debian-jessie-build $(MAKE) -C osmo-ggsn-master +.PHONY: osmo-hlr-master +osmo-hlr-master: debian-jessie-build + $(MAKE) -C osmo-hlr-master + .PHONY: ttcn3-bsc-test ttcn3-bsc-test: debian-stretch-titan osmo-stp-master osmo-bsc-master osmo-bts-master ttcn3-bsc-test $(MAKE) -C ttcn3-bsc-test @@ -53,6 +57,10 @@ ttcn3-mgw-test: debian-stretch-titan osmo-mgw-master $(MAKE) -C ttcn3-mgw-test +.PHONY: ttcn3-hlr-test +ttcn3-hlr-test: debian-stretch-titan osmo-hlr-master + $(MAKE) -C ttcn3-hlr-test + .PHONY: sctp-test sctp-test: debian-jessie-build $(MAKE) -C sctp-test -- To view, visit https://gerrit.osmocom.org/11043 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: Idfd59c3faabeaa1af00df988513d5574c680a3bb Gerrit-Change-Number: 11043 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:09:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:09:01 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 20 Sep 2018 15:09:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:10:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:10:01 +0000 Subject: Change in docker-playground[master]: root Makefile: add rules for ttcn3-hlr-test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11043 ) Change subject: root Makefile: add rules for ttcn3-hlr-test ...................................................................... Patch Set 1: Verified+1 (sorry about the topic name, this is not 'wip' but ready for merge) -- To view, visit https://gerrit.osmocom.org/11043 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: Idfd59c3faabeaa1af00df988513d5574c680a3bb Gerrit-Change-Number: 11043 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 20 Sep 2018 15:10:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Sep 20 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Sep 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_#252?= In-Reply-To: <689879138.182.1537369806633.JavaMail.jenkins@jenkins.osmocom.org> References: <689879138.182.1537369806633.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1708472561.198.1537456206662.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_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 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_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 -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 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_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_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_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 Sep 20 15:20:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:20:15 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py File scripts/osmo-depcheck/buildstack.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py at 97 PS2, Line 97: old = os.environ[env_var] if env_var in os.environ else "" > Nice trick, but that seems to be a bit over-engineered here IMHO. ":path" will work just as well. hmm, really, ":/path" is allowed? but it looks unhappy. I don't think it's overengineered, but whatever, nm https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py File scripts/osmo-depcheck/config.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py at 18 PS2, Line 18: # they are mentioned with PKG_CHECK_MODULES in configure.ac. > Good point with the tuples. [?] not important. https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py File scripts/osmo-depcheck/dependencies.py: https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/dependencies.py at 20 PS2, Line 20: # Clone when needed > Well, this is a pretty short function (14 LOC), and it does have a few key differences: [?] not that important, keep it -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 15:20:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:24:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:24:29 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 15:24: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 Sep 20 15:38:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Sep 2018 15:38:18 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11041 ) Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... Patch Set 1: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11041/1/debian-repo-install-test/testdata/repo-install-test.sh File debian-repo-install-test/testdata/repo-install-test.sh: https://gerrit.osmocom.org/#/c/11041/1/debian-repo-install-test/testdata/repo-install-test.sh at 57 PS1, Line 57: echo "ERROR: this program had UNKNOWN in --version!" s/had/prints https://gerrit.osmocom.org/#/c/11041/1/debian-repo-install-test/testdata/repo-install-test.sh at 62 PS1, Line 62: echo "ERROR: the following program(s) had UNKNOWN in --version:" s/had/print https://gerrit.osmocom.org/#/c/11041/1/debian-repo-install-test/testdata/repo-install-test.sh at 73 PS1, Line 73: osmo-trx-usrp1 -h created issues that ask for --version to be added: OS#3576 OS#3577 OS#3578 -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Sep 2018 15:38:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Sep 2018 15:42:13 +0000 Subject: Change in libosmocore[master]: ensure unix socket paths are NUL-terminated for bind/connect Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11044 Change subject: ensure unix socket paths are NUL-terminated for bind/connect ...................................................................... ensure unix socket paths are NUL-terminated for bind/connect The unix(7) man page recommends that sun_path is NUL-terminated when struct sockaddr_un is passed to a bind() or connect() call. Non-NUL-terminated paths only need to be dealt with at the receiving end of a UNIX domain socket. Commit 896ff6d erroneously assumed otherwise. This commit almost reverts 896ff6d: It only leaves the added osmo_strlcpy() overflow check in place. Change-Id: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a Fixes: 896ff6db161465d506bb9bb5bee2cdeef220dd2e Related: OS#2673 --- M src/socket.c 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/11044/1 diff --git a/src/socket.c b/src/socket.c index 6f56efb..a85edb7 100644 --- a/src/socket.c +++ b/src/socket.c @@ -605,29 +605,27 @@ 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; - 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)) { + /* When an AF_UNIX socket is bound, sun_path should be NUL-terminated. See unix(7) man page. */ + 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 = socket_path_len; + local.sun_len = strlen(local.sun_path); #endif #if defined(BSD44SOCKETS) || defined(SUN_LEN) namelen = SUN_LEN(&local); #else - namelen = socket_path_len + offsetof(struct sockaddr_un, sun_path); + namelen = strlen(local.sun_path) + + offsetof(struct sockaddr_un, sun_path); #endif sfd = socket(AF_UNIX, type, proto); -- To view, visit https://gerrit.osmocom.org/11044 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: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a Gerrit-Change-Number: 11044 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:42:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Sep 2018 15:42:28 +0000 Subject: Change in libosmo-abis[master]: ensure unix socket paths are NUL-terminated for bind/connect Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11045 Change subject: ensure unix socket paths are NUL-terminated for bind/connect ...................................................................... ensure unix socket paths are NUL-terminated for bind/connect The unix(7) man page recommends that sun_path is NUL-terminated when struct sockaddr_un is passed to a bind() or connect() call. Non-NUL-terminated paths only need to be dealt with at the receiving end of a UNIX domain socket. Commit b24efa5 erroneously assumed otherwise. Change-Id: I9beecfa500db75cb679b1edcc352c893bf098b13 Fixes: b24efa551dc91e177c5cb8da674e9f8432d52dc9 Related: OS#2673 --- M src/e1_input_vty.c M src/input/unixsocket.c 2 files changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/45/11045/1 diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 653c573..d81c859 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -101,10 +101,10 @@ 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)) { + /* Don't exceed the maximum unix socket path length, including a NUL byte. See the unix(7) man page.*/ + if (strlen(argv[1]) > sizeof(sun.sun_path) - 1) { vty_out(vty, "%% Socket path length exceeds %zd bytes: '%s'%s", - sizeof(sun.sun_path), argv[1], VTY_NEWLINE); + sizeof(sun.sun_path) - 1, argv[1], VTY_NEWLINE); return CMD_WARNING; } diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c index 00e1f9b..bc4b357 100644 --- a/src/input/unixsocket.c +++ b/src/input/unixsocket.c @@ -229,7 +229,7 @@ static int unixsocket_line_update(struct e1inp_line *line) { struct unixsocket_line *config; - char default_sock_path[sizeof(struct sockaddr_un) + 1]; /* see unix(7) man page */ + struct sockaddr_un un; const char *sock_path; int ret = 0; int i; @@ -252,9 +252,17 @@ /* 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; + ret = snprintf(un.sun_path, sizeof(un.sun_path), "%s%d", + UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); + if (ret == -1) { + LOGP(DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno)); + return -errno; + } else if (ret >= sizeof(un.sun_path)) { + LOGP(DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n", + sizeof(un.sun_path), UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); + return -ENOSPC; + } + sock_path = un.sun_path; } else sock_path = line->sock_path; ret = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, -- To view, visit https://gerrit.osmocom.org/11045 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: I9beecfa500db75cb679b1edcc352c893bf098b13 Gerrit-Change-Number: 11045 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 15:56:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Sep 2018 15:56:49 +0000 Subject: Change in osmo-bsc[master]: check for overlong unix socket paths Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11046 Change subject: check for overlong unix socket paths ...................................................................... check for overlong unix socket paths In rf_create_socket(), check the result of osmo_strlcpy(). This catches overlong and non-NUL-terminated socket paths. Change-Id: I4b9ff9146068bf7f53d67c577454f32c02361b86 Related: OS#2673 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/11046/1 diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index f4a21b5..ac87fb9 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -450,8 +450,12 @@ } local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)); unlink(local.sun_path); + if (osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { + LOGP(DLINP, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", + sizeof(local.sun_path), path); + return -1; + } /* we use the same magic that X11 uses in Xtranssock.c for * calculating the proper length of the sockaddr */ -- To view, visit https://gerrit.osmocom.org/11046 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: I4b9ff9146068bf7f53d67c577454f32c02361b86 Gerrit-Change-Number: 11046 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 16:09:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 16:09:09 +0000 Subject: Change in osmo-trx[master]: Use pthread_setname_np to name threads Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11047 Change subject: Use pthread_setname_np to name threads ...................................................................... Use pthread_setname_np to name threads osmo-trx can start a considerable amount of threads that can make debugging it challenging at least. By using phtread_setname_np, the system sets a meaningful name to the thread which can be seen while debugging with gdb or by printing /proc/$pid/task/$tid/comm. Now we also log system TID when setting the name so we can identify different tasks in /proc even if pthread_setname_np fails. Change-Id: I84711739c3e224cb383fd12b6db933785b28209e --- M CommonLibs/Threads.cpp M CommonLibs/Threads.h M Transceiver52M/Transceiver.cpp M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/radioInterface.cpp M tests/CommonLibs/Makefile.am 6 files changed, 43 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/47/11047/1 diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index de6520b..2988e12 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -24,11 +24,17 @@ */ - - +#include +#include #include "Threads.h" #include "Timeval.h" +#include "Logger.h" + +#ifndef gettid +#include +#define gettid() syscall(SYS_gettid) +#endif using namespace std; @@ -102,6 +108,19 @@ pthread_cond_timedwait(&mSignal,&wMutex.mMutex,&waitTime); } +void set_selfthread_name(const char *name) +{ + pthread_t selfid = pthread_self(); + pid_t tid = gettid(); + if (pthread_setname_np(selfid, name) == 0) { + LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name; + } else { + char buf[256]; + int err = errno; + char* err_str = strerror_r(err, buf, sizeof(buf)); + LOG(NOTICE) << "Thread "<< selfid << " (task " << tid << ") set name \"" << name << "\" failed: (" << err << ") " << err_str; + } +} void Thread::start(void *(*task)(void*), void *arg) { diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h index 47c7275..857c5d9 100644 --- a/CommonLibs/Threads.h +++ b/CommonLibs/Threads.h @@ -141,6 +141,8 @@ #define START_THREAD(thread,function,argument) \ thread.start((void *(*)(void*))function, (void*)argument); +void set_selfthread_name(const char *name); + /** A C++ wrapper for pthread threads. */ class Thread { diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index cdfd79d..076db3e 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1044,11 +1044,15 @@ void *RxUpperLoopAdapter(TransceiverChannel *chan) { + char thread_name[16]; Transceiver *trx = chan->trx; size_t num = chan->num; delete chan; + snprintf(thread_name, 16, "RxUpper%zu", num); + set_selfthread_name(thread_name); + trx->setPriority(0.42); while (1) { @@ -1060,6 +1064,8 @@ void *RxLowerLoopAdapter(Transceiver *transceiver) { + set_selfthread_name("RxLower"); + transceiver->setPriority(0.45); while (1) { @@ -1071,6 +1077,8 @@ void *TxLowerLoopAdapter(Transceiver *transceiver) { + set_selfthread_name("TxLower"); + transceiver->setPriority(0.44); while (1) { @@ -1082,11 +1090,15 @@ void *ControlServiceLoopAdapter(TransceiverChannel *chan) { + char thread_name[16]; Transceiver *trx = chan->trx; size_t num = chan->num; delete chan; + snprintf(thread_name, 16, "CtrlService%zu", num); + set_selfthread_name(thread_name); + while (1) { trx->driveControl(num); pthread_testcancel(); @@ -1096,11 +1108,15 @@ void *TxUpperLoopAdapter(TransceiverChannel *chan) { + char thread_name[16]; Transceiver *trx = chan->trx; size_t num = chan->num; delete chan; + snprintf(thread_name, 16, "TxUpper%zu", num); + set_selfthread_name(thread_name); + trx->setPriority(0.40); while (1) { diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index b7109a4..c30f3a7 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -322,6 +322,7 @@ void *async_event_loop(uhd_device *dev) { + set_selfthread_name("UHDAsyncEvent"); dev->setPriority(0.43); while (1) { diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 7d6a03b..0f949d7 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -148,6 +148,7 @@ /** synchronization thread loop */ void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface) { + set_selfthread_name("AlignRadio"); while (1) { sleep(60); radioInterface->alignRadio(); diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am index 4543c72..2a9a021 100644 --- a/tests/CommonLibs/Makefile.am +++ b/tests/CommonLibs/Makefile.am @@ -28,11 +28,11 @@ InterthreadTest_SOURCES = InterthreadTest.cpp InterthreadTest_LDADD = $(COMMON_LA) -InterthreadTest_LDFLAGS = -lpthread +InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS) SocketsTest_SOURCES = SocketsTest.cpp SocketsTest_LDADD = $(COMMON_LA) -SocketsTest_LDFLAGS = -lpthread +SocketsTest_LDFLAGS = -lpthread $(AM_LDFLAGS) TimevalTest_SOURCES = TimevalTest.cpp TimevalTest_LDADD = $(COMMON_LA) -- To view, visit https://gerrit.osmocom.org/11047 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: I84711739c3e224cb383fd12b6db933785b28209e Gerrit-Change-Number: 11047 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 Sep 20 16:34:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Sep 2018 16:34:21 +0000 Subject: Change in osmo-pcu[master]: check for overlong unix socket paths Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11048 Change subject: check for overlong unix socket paths ...................................................................... check for overlong unix socket paths In pcu_l1if_open(), use osmo_strlcpy() instead of strncpy() and check for overflow. This catches overlong and non-NUL-terminated socket paths. Change-Id: I825190cbb34d052b797e9fb5208884d6f5992839 Related: OS#2673 --- M src/osmobts_sock.cpp 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/48/11048/1 diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 477521d..6b49347 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -265,8 +265,11 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; + if (osmo_strlcpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", + sizeof(local.sun_path), bts->pcu_sock_path); + return -ENOSPC; + } /* we use the same magic that X11 uses in Xtranssock.c for * calculating the proper length of the sockaddr */ -- To view, visit https://gerrit.osmocom.org/11048 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: I825190cbb34d052b797e9fb5208884d6f5992839 Gerrit-Change-Number: 11048 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 17:03:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Sep 2018 17:03:05 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 5: I did some tests and I lack some little improvements. See my comments in https://osmocom.org/issues/2642#note-26 They can be done in separate commits though. -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Sep 2018 17:03:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 20 17:18:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Sep 2018 17:18:37 +0000 Subject: Change in osmo-trx[master]: Use pthread_setname_np to name threads In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11047 ) Change subject: Use pthread_setname_np to name threads ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11047 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: I84711739c3e224cb383fd12b6db933785b28209e Gerrit-Change-Number: 11047 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Sep 2018 17:18: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 Sep 20 17:25:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Sep 2018 17:25:07 +0000 Subject: Change in osmo-pcu[master]: check for overlong unix socket paths In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11048 ) Change subject: check for overlong unix socket paths ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11048/1/src/osmobts_sock.cpp File src/osmobts_sock.cpp: https://gerrit.osmocom.org/#/c/11048/1/src/osmobts_sock.cpp at 268 PS1, Line 268: if (osmo_strlcpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { I would prefer to see: rc = osmo_strlcpy(...); if (rc) { ... } here instead of this long construction. -- To view, visit https://gerrit.osmocom.org/11048 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: I825190cbb34d052b797e9fb5208884d6f5992839 Gerrit-Change-Number: 11048 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Sep 2018 17:25:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 20 20:03:17 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:03:17 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ba3fd21d8370_3a78fa468c111853@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 249s] No package 'libpcsclite' found [ 249s] simtrace2-remsim.o: In function `main': [ 249s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 249s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 249s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 249s] apdu_dispatch.o: In function `apdu_segment_in': [ 249s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 249s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 249s] collect2: error: ld returned 1 exit status [ 249s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 249s] make[2]: *** [simtrace2-remsim] Error 1 [ 249s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 249s] Makefile:20: recipe for target 'utils' failed [ 249s] make[1]: *** [utils] Error 2 [ 249s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 249s] dh_auto_build: make -j1 returned exit code 2 [ 249s] debian/rules:4: recipe for target 'build' failed [ 249s] make: *** [build] Error 2 [ 249s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 249s] [ 249s] armbuild01 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:03:07 UTC 2018. [ 249s] [ 249s] ### VM INTERACTION START ### [ 252s] [ 222.252625] SysRq : Power Off [ 252s] [ 222.253919] reboot: Power down [ 252s] ### VM INTERACTION END ### [ 252s] [ 252s] armbuild01 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:03:10 UTC 2018. [ 252s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:07:51 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:07:51 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5ba3fe2f2e43d_3a78fa468c1122b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 195s] No package 'libpcsclite' found [ 195s] simtrace2-remsim.o: In function `main': [ 195s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 195s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 195s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 195s] apdu_dispatch.o: In function `apdu_segment_in': [ 195s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 195s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 195s] collect2: error: ld returned 1 exit status [ 195s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 195s] make[2]: *** [simtrace2-remsim] Error 1 [ 195s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 195s] Makefile:20: recipe for target 'utils' failed [ 195s] make[1]: *** [utils] Error 2 [ 195s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 195s] dh_auto_build: make -j1 returned exit code 2 [ 195s] debian/rules:4: recipe for target 'build' failed [ 195s] make: *** [build] Error 2 [ 195s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 195s] [ 195s] cloud104 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:07:38 UTC 2018. [ 195s] [ 195s] ### VM INTERACTION START ### [ 198s] [ 159.712221] sysrq: SysRq : Power Off [ 198s] [ 159.716557] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] cloud104 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:07:44 UTC 2018. [ 200s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:13:34 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:13:34 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5ba3ff7a178cb_3a78fa468c1127f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 172s] No package 'libpcsclite' found [ 172s] simtrace2-remsim.o: In function `main': [ 172s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 172s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 172s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 172s] apdu_dispatch.o: In function `apdu_segment_in': [ 172s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 172s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 172s] collect2: error: ld returned 1 exit status [ 172s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 172s] make[2]: *** [simtrace2-remsim] Error 1 [ 172s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 172s] Makefile:20: recipe for target 'utils' failed [ 172s] make[1]: *** [utils] Error 2 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] dh_auto_build: make -j1 returned exit code 2 [ 172s] debian/rules:4: recipe for target 'build' failed [ 172s] make: *** [build] Error 2 [ 172s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 172s] [ 172s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:13:26 UTC 2018. [ 172s] [ 172s] ### VM INTERACTION START ### [ 175s] [ 163.737906] sysrq: SysRq : Power Off [ 175s] [ 163.743734] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:13:30 UTC 2018. [ 175s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:14:08 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:14:08 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5ba3ff99bd83b_3a78fa468c1128b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 201s] No package 'libpcsclite' found [ 201s] simtrace2-remsim.o: In function `main': [ 201s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 201s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 201s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 201s] apdu_dispatch.o: In function `apdu_segment_in': [ 201s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 201s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 201s] collect2: error: ld returned 1 exit status [ 201s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 201s] make[2]: *** [simtrace2-remsim] Error 1 [ 201s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 201s] Makefile:20: recipe for target 'utils' failed [ 201s] make[1]: *** [utils] Error 2 [ 201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 201s] dh_auto_build: make -j1 returned exit code 2 [ 201s] debian/rules:4: recipe for target 'build' failed [ 201s] make: *** [build] Error 2 [ 201s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 201s] [ 201s] lamb22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:13:53 UTC 2018. [ 201s] [ 201s] ### VM INTERACTION START ### [ 205s] [ 192.628549] sysrq: SysRq : Power Off [ 205s] [ 192.636057] reboot: Power down [ 205s] ### VM INTERACTION END ### [ 205s] [ 205s] lamb22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:13:58 UTC 2018. [ 205s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:14:25 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:14:25 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5ba3ffb415745_3a78fa468c1129c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 138s] No package 'libpcsclite' found [ 139s] simtrace2-remsim.o: In function `main': [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 139s] apdu_dispatch.o: In function `apdu_segment_in': [ 139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 139s] collect2: error: ld returned 1 exit status [ 139s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 139s] make[2]: *** [simtrace2-remsim] Error 1 [ 139s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 139s] Makefile:20: recipe for target 'utils' failed [ 139s] make[1]: *** [utils] Error 2 [ 139s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 139s] dh_auto_build: make -j1 returned exit code 2 [ 139s] debian/rules:4: recipe for target 'build' failed [ 139s] make: *** [build] Error 2 [ 139s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 139s] [ 139s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:14:17 UTC 2018. [ 139s] [ 139s] ### VM INTERACTION START ### [ 142s] [ 131.902753] sysrq: SysRq : Power Off [ 142s] [ 131.909320] reboot: Power down [ 142s] ### VM INTERACTION END ### [ 142s] [ 142s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:14:21 UTC 2018. [ 142s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:16:08 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:16:08 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5ba40011aead7_3a78fa468c113489@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 145s] No package 'libpcsclite' found [ 145s] simtrace2-remsim.o: In function `main': [ 145s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 145s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 145s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 145s] apdu_dispatch.o: In function `apdu_segment_in': [ 145s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 145s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 145s] collect2: error: ld returned 1 exit status [ 145s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 145s] make[2]: *** [simtrace2-remsim] Error 1 [ 145s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 145s] Makefile:20: recipe for target 'utils' failed [ 145s] make[1]: *** [utils] Error 2 [ 145s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 145s] dh_auto_build: make -j1 returned exit code 2 [ 145s] debian/rules:4: recipe for target 'build' failed [ 145s] make: *** [build] Error 2 [ 145s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 145s] [ 145s] lamb14 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:16:01 UTC 2018. [ 145s] [ 145s] ### VM INTERACTION START ### [ 148s] [ 136.391398] sysrq: SysRq : Power Off [ 148s] [ 136.406993] reboot: Power down [ 148s] ### VM INTERACTION END ### [ 148s] [ 148s] lamb14 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:16:05 UTC 2018. [ 148s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:16:08 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:16:08 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5ba400132caad_3a78fa468c1135e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 104s] No package 'libpcsclite' found [ 104s] simtrace2-remsim.o: In function `main': [ 104s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 104s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 104s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 104s] apdu_dispatch.o: In function `apdu_segment_in': [ 104s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 104s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 104s] collect2: error: ld returned 1 exit status [ 104s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 104s] make[2]: *** [simtrace2-remsim] Error 1 [ 104s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 104s] Makefile:20: recipe for target 'utils' failed [ 104s] make[1]: *** [utils] Error 2 [ 104s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 104s] dh_auto_build: make -j1 returned exit code 2 [ 104s] debian/rules:4: recipe for target 'build' failed [ 104s] make: *** [build] Error 2 [ 104s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 104s] [ 104s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:15:56 UTC 2018. [ 104s] [ 104s] ### VM INTERACTION START ### [ 107s] [ 99.184467] sysrq: SysRq : Power Off [ 107s] [ 99.188674] reboot: Power down [ 107s] ### VM INTERACTION END ### [ 107s] [ 107s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:15:59 UTC 2018. [ 107s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:17:34 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:17:34 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5ba4006966b46_3a78fa468c11395@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 137s] No package 'libpcsclite' found [ 137s] simtrace2-remsim.o: In function `main': [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 137s] apdu_dispatch.o: In function `apdu_segment_in': [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 137s] collect2: error: ld returned 1 exit status [ 137s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 137s] make[2]: *** [simtrace2-remsim] Error 1 [ 137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 137s] Makefile:20: recipe for target 'utils' failed [ 137s] make[1]: *** [utils] Error 2 [ 137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 137s] dh_auto_build: make -j1 returned exit code 2 [ 137s] debian/rules:4: recipe for target 'build' failed [ 137s] make: *** [build] Error 2 [ 137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 137s] [ 137s] lamb04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:17:16 UTC 2018. [ 137s] [ 137s] ### VM INTERACTION START ### [ 141s] [ 130.642580] sysrq: SysRq : Power Off [ 141s] [ 130.650887] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 141s] [ 141s] lamb04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:17:20 UTC 2018. [ 141s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Sep 20 20:18:25 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 20 Sep 2018 20:18:25 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5ba400a3eac76_3a78fa468c1141ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 162s] No package 'libpcsclite' found [ 162s] simtrace2-remsim.o: In function `main': [ 162s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 162s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 162s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 162s] apdu_dispatch.o: In function `apdu_segment_in': [ 162s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 162s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 162s] collect2: error: ld returned 1 exit status [ 162s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 162s] make[2]: *** [simtrace2-remsim] Error 1 [ 162s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 162s] Makefile:20: recipe for target 'utils' failed [ 162s] make[1]: *** [utils] Error 2 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] dh_auto_build: make -j1 returned exit code 2 [ 162s] debian/rules:4: recipe for target 'build' failed [ 162s] make: *** [build] Error 2 [ 162s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 162s] [ 162s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:18:10 UTC 2018. [ 162s] [ 162s] ### VM INTERACTION START ### [ 165s] [ 154.451104] sysrq: SysRq : Power Off [ 165s] [ 154.457774] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Thu Sep 20 20:18:14 UTC 2018. [ 165s] -- 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 Sep 21 07:12:19 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 07:12:19 +0000 Subject: Change in libosmocore[master]: gsm0808_utils: constify parameter Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11049 Change subject: gsm0808_utils: constify parameter ...................................................................... gsm0808_utils: constify parameter parameter cfg in gsm0808_sc_cfg_from_gsm48_mr_cfg() is used read only. Lets add a const to make this clear to the compiler. Change-Id: I31e8d273b070b0afc446a298299d4f502d6c396b --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/11049/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 0a7429e..8746ceb 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,7 +104,7 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 4b2a5f5..0d6938e 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1166,7 +1166,7 @@ * \param[in] cfg AMR configuration in GSM 04.08 format. * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. * \returns configuration bits (S0-S15) */ -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr) { uint16_t s15_s0 = 0; -- To view, visit https://gerrit.osmocom.org/11049 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: I31e8d273b070b0afc446a298299d4f502d6c396b Gerrit-Change-Number: 11049 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 07:56:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Sep 2018 07:56:57 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: (re)structurize help message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11050 Change subject: apps/grgsm_trx: (re)structurize help message ...................................................................... apps/grgsm_trx: (re)structurize help message Change-Id: I612d8ae7d3ff99fee809e10d95919989bfbe0f59 --- M apps/grgsm_trx 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/50/11050/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index efb9c24..6b3565d 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -104,40 +104,42 @@ parser = ArgumentParser(prog = "grgsm_trx") # TRX interface specific - parser.add_argument("-i", "--remote-addr", + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-i", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", help = "Set remote address (default %(default)s)") - parser.add_argument("-b", "--bind-addr", + trx_group.add_argument("-b", "--bind-addr", dest = "bind_addr", type = str, default = "0.0.0.0", help = "Set bind address (default %(default)s)") - parser.add_argument("-p", "--base_port", + trx_group.add_argument("-p", "--base_port", dest = "base_port", type = int, default = 6700, help = "Set base port number (default %(default)s)") # PHY specific - parser.add_argument("-a", "--args", + phy_group = parser.add_argument_group("PHY parameters") + phy_group.add_argument("-a", "--args", dest = "args", type = str, default = "", help = "Set device arguments") - parser.add_argument("-s", "--sample-rate", + phy_group.add_argument("-s", "--sample-rate", dest = "sample_rate", type = eng_float, default = radio_if.SAMPLE_RATE, help = "Set samp_rate (default %(default)s)") - parser.add_argument("-g", "--rx-gain", + phy_group.add_argument("-g", "--rx-gain", dest = "rx_gain", type = float, default = 30, help = "Set RX gain (default %(default)s)") - parser.add_argument("-G", "--tx-gain", + phy_group.add_argument("-G", "--tx-gain", dest = "tx_gain", type = float, default = 10, help = "Set TX gain (default %(default)s)") - parser.add_argument("--rx-antenna", + phy_group.add_argument("--rx-antenna", dest = "rx_antenna", type = str, default = "RX2", help = "Set RX antenna (default %(default)s)") - parser.add_argument("--tx-antenna", + phy_group.add_argument("--tx-antenna", dest = "tx_antenna", type = str, default = "TX/RX", help = "Set TX antenna (default %(default)s)") - parser.add_argument("--freq-offset", + phy_group.add_argument("--freq-offset", dest = "freq_offset", type = eng_float, default = 0, help = "Shift baseband freq. (e.g. -500M)") - parser.add_argument("--ppm", + phy_group.add_argument("--ppm", dest = "ppm", type = float, default = 0, help = "Set frequency correction (default %(default)s)") -- To view, visit https://gerrit.osmocom.org/11050 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: I612d8ae7d3ff99fee809e10d95919989bfbe0f59 Gerrit-Change-Number: 11050 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 08:15:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 08:15:34 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11041 to look at the new patch set (#2). Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... debian-repo-install-test: UNKNOWN in --version? With this patch, the debian-repo-install-test script checks if the Osmocom programs as installed from the Debian repository have "UNKNOWN" in their --version output. Relates: OS#3555 Change-Id: I46f18dc86d3e257c772a6db8539027aad26e24a8 --- M debian-repo-install-test/testdata/repo-install-test.sh 1 file changed, 36 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/11041/2 -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 08:18:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:18:01 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11041 ) Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Sep 2018 08:18: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 Sep 21 08:18:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:18:41 +0000 Subject: Change in libosmocore[master]: gsm0808_utils: constify parameter In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11049 ) Change subject: gsm0808_utils: constify parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11049 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: I31e8d273b070b0afc446a298299d4f502d6c396b Gerrit-Change-Number: 11049 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Sep 2018 08:18: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 Sep 21 08:18:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 08:18:53 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11041 ) Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... Patch Set 2: Thanks for the review, updated. -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Sep 2018 08:18:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 08:19:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 08:19:26 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11041 ) Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Sep 2018 08:19: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 Sep 21 08:19:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:19:26 +0000 Subject: Change in osmo-bsc[master]: check for overlong unix socket paths In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11046 ) Change subject: check for overlong unix socket paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11046 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: I4b9ff9146068bf7f53d67c577454f32c02361b86 Gerrit-Change-Number: 11046 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Sep 2018 08:19: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 Sep 21 08:19:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:19:30 +0000 Subject: Change in osmo-pcu[master]: check for overlong unix socket paths In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11048 ) Change subject: check for overlong unix socket paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11048 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: I825190cbb34d052b797e9fb5208884d6f5992839 Gerrit-Change-Number: 11048 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Sep 2018 08:19: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 Sep 21 08:19:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 08:19:30 +0000 Subject: Change in docker-playground[master]: debian-repo-install-test: UNKNOWN in --version? In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11041 ) Change subject: debian-repo-install-test: UNKNOWN in --version? ...................................................................... debian-repo-install-test: UNKNOWN in --version? With this patch, the debian-repo-install-test script checks if the Osmocom programs as installed from the Debian repository have "UNKNOWN" in their --version output. Relates: OS#3555 Change-Id: I46f18dc86d3e257c772a6db8539027aad26e24a8 --- M debian-repo-install-test/testdata/repo-install-test.sh 1 file changed, 36 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/debian-repo-install-test/testdata/repo-install-test.sh b/debian-repo-install-test/testdata/repo-install-test.sh index ea1c5fb..3ef88e8 100755 --- a/debian-repo-install-test/testdata/repo-install-test.sh +++ b/debian-repo-install-test/testdata/repo-install-test.sh @@ -44,25 +44,48 @@ apt install -y $(cat /data/osmocom_packages.txt) } +test_binaries_version() { + # Make sure --version runs and does not output UNKNOWN + failed="" + for program in $@; do + # Make sure it runs at all + $program --version + + # Check for UNKNOWN + if $program --version | grep -q UNKNOWN; then + failed="$failed $program" + echo "ERROR: this program prints UNKNOWN in --version!" + fi + done + + if [ -n "$failed" ]; then + echo "ERROR: the following program(s) print UNKNOWN in --version:" + echo "$failed" + return 1 + fi +} + test_binaries() { # Make sure the binaries are not broken (run -h or --version) - osmo-bsc --version - osmo-bts-trx --version - osmo-bts-virtual --version - osmo-gbproxy --version - osmo-ggsn --version osmo-gtphub -h - osmo-hlr --version - osmo-hlr-db-tool --version - osmo-hnbgw --version - osmo-mgw --version - osmo-msc --version - osmo-pcu --version - osmo-sgsn --version osmo-sip-connector -h - osmo-stp --version osmo-trx-uhd -h osmo-trx-usrp1 -h + + test_binaries_version \ + osmo-bsc \ + osmo-bts-trx \ + osmo-bts-virtual \ + osmo-gbproxy \ + osmo-ggsn \ + osmo-hlr \ + osmo-hlr-db-tool \ + osmo-hnbgw \ + osmo-mgw \ + osmo-msc \ + osmo-pcu \ + osmo-sgsn \ + osmo-stp } finish() { -- To view, visit https://gerrit.osmocom.org/11041 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: I46f18dc86d3e257c772a6db8539027aad26e24a8 Gerrit-Change-Number: 11041 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 08:19:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:19:47 +0000 Subject: Change in libosmocore[master]: ensure unix socket paths are NUL-terminated for bind/connect In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11044 ) Change subject: ensure unix socket paths are NUL-terminated for bind/connect ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11044 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: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a Gerrit-Change-Number: 11044 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Sep 2018 08:19: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 Sep 21 08:19:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:19:49 +0000 Subject: Change in libosmo-abis[master]: ensure unix socket paths are NUL-terminated for bind/connect In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11045 ) Change subject: ensure unix socket paths are NUL-terminated for bind/connect ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11045 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: I9beecfa500db75cb679b1edcc352c893bf098b13 Gerrit-Change-Number: 11045 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Sep 2018 08:19:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 08:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:20:03 +0000 Subject: Change in docker-playground[master]: root Makefile: add rules for ttcn3-hlr-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11043 ) Change subject: root Makefile: add rules for ttcn3-hlr-test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11043 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: Idfd59c3faabeaa1af00df988513d5574c680a3bb Gerrit-Change-Number: 11043 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 21 Sep 2018 08:20: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 Sep 21 08:20:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:20:26 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 21 Sep 2018 08:20: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 Sep 21 08:23:49 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 21 Sep 2018 08:23:49 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: (re)structurize help message In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/11050 ) Change subject: apps/grgsm_trx: (re)structurize help message ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11050 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: I612d8ae7d3ff99fee809e10d95919989bfbe0f59 Gerrit-Change-Number: 11050 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 21 Sep 2018 08: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 Fri Sep 21 08:23:51 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 21 Sep 2018 08:23:51 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: (re)structurize help message In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/11050 ) Change subject: apps/grgsm_trx: (re)structurize help message ...................................................................... apps/grgsm_trx: (re)structurize help message Change-Id: I612d8ae7d3ff99fee809e10d95919989bfbe0f59 --- M apps/grgsm_trx 1 file changed, 13 insertions(+), 11 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index efb9c24..6b3565d 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -104,40 +104,42 @@ parser = ArgumentParser(prog = "grgsm_trx") # TRX interface specific - parser.add_argument("-i", "--remote-addr", + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-i", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", help = "Set remote address (default %(default)s)") - parser.add_argument("-b", "--bind-addr", + trx_group.add_argument("-b", "--bind-addr", dest = "bind_addr", type = str, default = "0.0.0.0", help = "Set bind address (default %(default)s)") - parser.add_argument("-p", "--base_port", + trx_group.add_argument("-p", "--base_port", dest = "base_port", type = int, default = 6700, help = "Set base port number (default %(default)s)") # PHY specific - parser.add_argument("-a", "--args", + phy_group = parser.add_argument_group("PHY parameters") + phy_group.add_argument("-a", "--args", dest = "args", type = str, default = "", help = "Set device arguments") - parser.add_argument("-s", "--sample-rate", + phy_group.add_argument("-s", "--sample-rate", dest = "sample_rate", type = eng_float, default = radio_if.SAMPLE_RATE, help = "Set samp_rate (default %(default)s)") - parser.add_argument("-g", "--rx-gain", + phy_group.add_argument("-g", "--rx-gain", dest = "rx_gain", type = float, default = 30, help = "Set RX gain (default %(default)s)") - parser.add_argument("-G", "--tx-gain", + phy_group.add_argument("-G", "--tx-gain", dest = "tx_gain", type = float, default = 10, help = "Set TX gain (default %(default)s)") - parser.add_argument("--rx-antenna", + phy_group.add_argument("--rx-antenna", dest = "rx_antenna", type = str, default = "RX2", help = "Set RX antenna (default %(default)s)") - parser.add_argument("--tx-antenna", + phy_group.add_argument("--tx-antenna", dest = "tx_antenna", type = str, default = "TX/RX", help = "Set TX antenna (default %(default)s)") - parser.add_argument("--freq-offset", + phy_group.add_argument("--freq-offset", dest = "freq_offset", type = eng_float, default = 0, help = "Shift baseband freq. (e.g. -500M)") - parser.add_argument("--ppm", + phy_group.add_argument("--ppm", dest = "ppm", type = float, default = 0, help = "Set frequency correction (default %(default)s)") -- To view, visit https://gerrit.osmocom.org/11050 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: I612d8ae7d3ff99fee809e10d95919989bfbe0f59 Gerrit-Change-Number: 11050 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 Sep 21 08:24:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:24:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9674 ) Change subject: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc ...................................................................... Patch Set 7: Code-Review+2 great. I think next we need to think about some of the many handover failure cases and testing for those. The most common ones of course being that either no RSL Handover Detect is received (as the phone wasn't received on the new lchan), or that Handover Detect still arrives, but no HO Complete is received, ... -- To view, visit https://gerrit.osmocom.org/9674 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: Id22852d4be7f127d827e7a8beeec55db27c07f03 Gerrit-Change-Number: 9674 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 21 Sep 2018 08:24: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 Sep 21 08:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:24:31 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Create a common chapter for section documenting backends In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11039 ) Change subject: osmotrx: Create a common chapter for section documenting backends ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11039 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: I6bea1ccca4ce72b92641a36f9f5894ac9a6cae72 Gerrit-Change-Number: 11039 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Sep 2018 08:24: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 Sep 21 08:24:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:24:43 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Introduce code architecture chapter In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11040 ) Change subject: osmotrx: Introduce code architecture chapter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11040 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: I21084e6315d79a1adcb305e12343da218837dc31 Gerrit-Change-Number: 11040 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Sep 2018 08:24: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 Sep 21 08:25:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:25:14 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verifica... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11038 ) Change subject: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11038 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: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a Gerrit-Change-Number: 11038 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 21 Sep 2018 08:25:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 08:25:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:25:24 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11030 ) Change subject: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11030 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: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 Gerrit-Change-Number: 11030 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 21 Sep 2018 08:25: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 Sep 21 08:25:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Sep 2018 08:25:37 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Add osmo-iuh builds In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11029 ) Change subject: jobs: osmo-gsm-tester: Add osmo-iuh builds ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11029 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: I7b8f51597287e7673f79c65eae2508b074151781 Gerrit-Change-Number: 11029 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 21 Sep 2018 08:25: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 Sep 21 08:26:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 08:26:28 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 21 Sep 2018 08: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 Fri Sep 21 08:26:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 08:26:33 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/10932 ) Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES ...................................................................... osmo-depcheck: script to verify PKG_CHECK_MODULES This script verifies that Osomcom programs really build with the dependency versions they claim to support in configure.ac. In order to do that, it clones the dependency repositories if they don't exist already, and checks out the minimum version tag. This happens recursively for their dependencies as well. See 'osmo-depcheck.py -h' for the full usage instructions. There's also a new jenkins job in jobs/osmocom-depcheck.yml. Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65 Relates: OS#2642 --- A jobs/osmocom-depcheck.yml A scripts/osmo-depcheck/buildstack.py A scripts/osmo-depcheck/config.py A scripts/osmo-depcheck/dependencies.py A scripts/osmo-depcheck/osmo-depcheck.py A scripts/osmo-depcheck/parse.py 6 files changed, 590 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml new file mode 100644 index 0000000..f13d4b7 --- /dev/null +++ b/jobs/osmocom-depcheck.yml @@ -0,0 +1,72 @@ +--- +- project: + name: Osmocom-depcheck + jobs: + - Osmocom-depcheck + +- job-template: + name: 'Osmocom-depcheck' + project-type: freestyle + defaults: global + description: | + Verifies that Osmocom programs really build with the dependency + versions they claim to support in configure.ac. + (Generated by job-builder) + node: osmocom-master-debian9 + parameters: + - string: + name: PROJECTS + description: | + Which Osmocom projects and revisions to build, leave + empty to default to all projects (!), + default revision is "master". + Examples: "osmo-hlr", "osmo-hlr:0.2.1 osmo-bts:0.8.1" + default: 'osmo-hlr:0.2.1' + - string: + name: GIT_URL_PREFIX + description: | + Where to clone the sources from + default: 'git://git.osmocom.org/' + - bool: + name: BUILD + description: | + Attempt to build the project with the minimum dependency + versions found in the configure.ac files. If this is unchecked, + this job will only clone the git repositories and parse the + configure.ac files. + default: true + - bool: + name: PRINT_OLD_DEPENDS + description: | + Report dependencies on old releases (printed after the other + parsing output, before the build starts) + default: false + - string: + name: BRANCH + description: | + Branch where the osmo-depcheck.py script gets pulled from. + Only modify this if you are hacking on osmo-depcheck.py. + default: '*/master' + builders: + - shell: | + # Build the arguments + args="$PROJECTS" + args="$args -j 5" + args="$args -g $PWD/DEPCHECK_GITDIR" + args="$args -u $GIT_URL_PREFIX" + [ "$BUILD" = "true" ] && args="$args -b" + [ "$PRINT_OLD_DEPENDS" = "true" ] && args="$args -o" + + # Run osmo-depcheck + mkdir DEPCHECK_GITDIR + export PYTHONUNBUFFERED=1 + scripts/osmo-depcheck/osmo-depcheck.py $args + scm: + - git: + branches: + - '$BRANCH' + url: git://git.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + +# vim: expandtab tabstop=2 shiftwidth=2 diff --git a/scripts/osmo-depcheck/buildstack.py b/scripts/osmo-depcheck/buildstack.py new file mode 100644 index 0000000..87210ab --- /dev/null +++ b/scripts/osmo-depcheck/buildstack.py @@ -0,0 +1,144 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2018 sysmocom - s.f.m.c. GmbH + +import atexit +import collections +import sys +import os +import shutil +import subprocess +import tempfile + + +def next_buildable(depends, done): + """ Find the next program that can be built, because it has all + dependencies satisfied. Initially this would be libosmocore, as it has + no dependencies, then the only library that depends on libosmocore and + so on. + + :param depends: return value of dependencies.generate() + :param done: ordered dict of programs that would already have been + built at this point. + Example: {"lib-a": "0.11.0", "lib-b": "0.5.0"} + """ + # Iterate over dependencies + for program, data in depends.items(): + # Skip what's already done + if program in done: + continue + + # Check for missing dependencies + depends_done = True + for depend in data["depends"]: + if depend not in done: + depends_done = False + break + + # All dependencies satisfied: we have a winner! + if depends_done: + return program, data["version"] + + # Impossible to build the dependency tree + print_dict(done) + print("ERROR: can't figure out how to build the rest!") + sys.exit(1) + + +def generate(depends): + """ Generate an ordered dictionary with the right build order. + + :param depends: return value of dependencies.generate() + :returns: an ordered dict like the following: + {"libosmocore": "0.11.0", + "libosmo-abis": "0.5.0", + "osmo-bts": "master"} """ + # Iterate over dependencies + ret = collections.OrderedDict() + count = len(depends.keys()) + while len(ret) != count: + # Continue with the one without unsatisfied dependencies + program, version = next_buildable(depends, ret) + ret[program] = version + return ret + + +def print_dict(stack): + """ Print the whole build stack. + :param stack: return value from generate() above """ + print("Build order:") + for program, version in stack.items(): + print(" * " + program + ":" + version) + + +def temp_install_folder(): + """ Generate a temporary installation folder + + It will be used as configure prefix, so when running 'make install', + the files will get copied in there instead of "/usr/local/". The folder + will get removed when the script has finished. + + :returns: the path to the temporary folder """ + ret = tempfile.mkdtemp(prefix="depcheck_") + atexit.register(shutil.rmtree, ret) + print("Temporary install folder: " + ret) + return ret + + +def set_environment(jobs, tempdir): + """ Configure the environment variables before running configure, make etc. + + :param jobs: parallel build jobs (for make) + :param tempdir: temporary installation dir (see temp_install_folder()) + """ + # Add tempdir to PKG_CONFIG_PATH and LD_LIBRARY_PATH + extend = {"PKG_CONFIG_PATH": tempdir + "/lib/pkgconfig", + "LD_LIBRARY_PATH": tempdir + "/lib"} + for env_var, folder in extend.items(): + old = os.environ[env_var] if env_var in os.environ else "" + os.environ[env_var] = old + ":" + folder + + # Set JOBS for make + os.environ["JOBS"] = str(jobs) + + +def build(gitdir, jobs, stack): + """ Build one program with all its dependencies. + + :param gitdir: folder to which the sources will be cloned + :param jobs: parallel build jobs (for make) + :param stack: the build stack as returned by generate() above + + The dependencies.clone() function has already downloaded missing + sources and checked out the right version tags. So in this function we + can directly enter the source folder and run the build commands. + + Notes about the usage of 'make clean' and 'make distclean': + * Without 'make clean' we might have files in the build directory with + a different prefix hardcoded (e.g. from a previous run of + osmo-depcheck): + + * 'make distclean' gets used to remove everything that mentioned the + prefix set by osmo-depcheck. That way the user won't have it set + anymore in case they decide to compile the code again manually from + the source folder. """ + # Prepare the install folder and environment + tempdir = temp_install_folder() + unitdir = tempdir + "/lib/systemd/system/" + set_environment(jobs, tempdir) + + # Iterate over stack + for program, version in stack.items(): + print("Building " + program + ":" + version) + os.chdir(gitdir + "/" + program) + + # Run the build commands + commands = [["autoreconf", "-fi"], + ["./configure", "--prefix", tempdir, + "--with-systemdsystemunitdir=" + unitdir], + ["make", "clean"], + ["make"], + ["make", "install"], + ["make", "distclean"]] + for command in commands: + print("+ " + " ".join(command)) + subprocess.run(command, check=True) diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py new file mode 100644 index 0000000..3e993bf --- /dev/null +++ b/scripts/osmo-depcheck/config.py @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2018 sysmocom - s.f.m.c. GmbH + +# Where to clone sources from (with trailing slash) +git_url_prefix = "git://git.osmocom.org/" + +# Default projects to build when none are specified on the command line +projects = ("osmo-bts", + "osmo-pcu", + "osmo-hlr", + "osmo-mgw", + "osmo-msc", + "osmo-sgsn", + "osmo-ggsn") + +# Libraries coming from Osmocom repositories (glob patterns) +# All other libraries (e.g. libsystemd) are ignored by this script, even if +# they are mentioned with PKG_CHECK_MODULES in configure.ac. +relevant_library_patterns = ("libasn1c", + "libgtp", + "libosmo*") + + +# Library locations in the git repositories +# Libraries that have the same name as the git repository don't need to be +# listed here. Left: repository name, right: libraries +repos = {"libosmocore": ("libosmocodec", + "libosmocoding", + "libosmoctrl", + "libosmogb", + "libosmogsm", + "libosmosim", + "libosmovty"), + "libosmo-abis": ("libosmoabis", + "libosmotrau"), + "libosmo-sccp": ("libosmo-mtp", + "libosmo-sigtran", + "libosmo-xua"), + "osmo-ggsn": ("libgtp"), + "osmo-hlr": ("libosmo-gsup-client"), + "osmo-iuh": ("libosmo-ranap"), + "osmo-mgw": ("libosmo-mgcp-client", + "libosmo-legacy-mgcp")} diff --git a/scripts/osmo-depcheck/dependencies.py b/scripts/osmo-depcheck/dependencies.py new file mode 100644 index 0000000..78cf4a0 --- /dev/null +++ b/scripts/osmo-depcheck/dependencies.py @@ -0,0 +1,114 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2018 sysmocom - s.f.m.c. GmbH + +import collections +import os +import subprocess +import sys + +# Same folder +import parse + + +def git_clone(gitdir, prefix, repository, version): + """ Clone a missing git repository and checkout a specific version tag. + + :param gitdir: folder to which the sources will be cloned + :param prefix: git url prefix (e.g. "git://git.osmocom.org/") + :param repository: Osmocom git repository name (e.g. "libosmo-abis") + :param version: "master" or a version tag like "0.11.0" """ + # Clone when needed + if not os.path.exists(gitdir + "/" + repository): + url = prefix + repository + print("Cloning git repo: " + url) + try: + subprocess.run(["git", "-C", gitdir, "clone", "-q", url], + check=True) + except subprocess.CalledProcessError: + print("NOTE: if '" + repository + "' is part of a git repository" + " with a different name, please add it to the mapping in" + " 'config.py' and try again.") + sys.exit(1) + + # Checkout the version tag + subprocess.run(["git", "-C", gitdir + "/" + repository, "checkout", + version, "-q"], check=True) + + +def generate(gitdir, prefix, initial, rev): + """ Generate the dependency graph of an Osmocom program by cloning the git + repository, parsing the "configure.ac" file, and recursing. + + :param gitdir: folder to which the sources will be cloned + :param prefix: git url prefix (e.g. "git://git.osmocom.org/") + :param initial: the first program to look at (e.g. "osmo-bts") + :param rev: the git revision to check out ("master", "0.1.0", ...) + :returns: a dictionary like the following: + {"osmo-bts": {"version": "master", + "depends": {"libosmocore": "0.11.0", + "libosmo-abis": "0.5.0"}}, + "libosmocore": {"version": "0.11.0", + "depends": {}}, + "libosmo-abis": {"version": "0.5.0", + "depends": {"libosmocore": "0.11.0"}} """ + # Iterate over stack + stack = collections.OrderedDict({initial: rev}) + ret = collections.OrderedDict() + while len(stack): + # Pop program from stack + program, version = next(iter(stack.items())) + del stack[program] + + # Skip when already parsed + if program in ret: + continue + + # Add the programs dependencies to the stack + print("Looking at " + program + ":" + version) + git_clone(gitdir, prefix, program, version) + depends = parse.configure_ac(gitdir, program) + stack.update(depends) + + # Add the program to the ret + ret[program] = {"version": version, "depends": depends} + + return ret + + +def print_dict(depends): + """ Print the whole dependency graph. + :param depends: return value from generate() above """ + print("Dependency graph:") + + for program, data in depends.items(): + version = data["version"] + depends = data["depends"] + print(" * " + program + ":" + version + " depends: " + str(depends)) + + +def git_latest_tag(gitdir, repository): + """ Get the last release string by asking git for the latest tag. + + :param gitdir: folder to which the sources will be cloned + :param repository: Osmocom git repository name (e.g. "libosmo-abis") + :returns: the latest git tag (e.g. "1.0.2") """ + dir = gitdir + "/" + repository + complete = subprocess.run(["git", "-C", dir, "describe", "--abbrev=0", + "master"], check=True, stdout=subprocess.PIPE) + return complete.stdout.decode().rstrip() + + +def print_old(gitdir, depends): + """ Print dependencies tied to an old release tag + + :param gitdir: folder to which the sources will be cloned + :param depends: return value from generate() above """ + print("Dependencies on old releases:") + + for program, data in depends.items(): + for depend, version in data["depends"].items(): + latest = git_latest_tag(gitdir, depend) + if latest == version: + continue + print(" * " + program + ":" + data["version"] + " -> " + + depend + ":" + version + " (latest: " + latest + ")") diff --git a/scripts/osmo-depcheck/osmo-depcheck.py b/scripts/osmo-depcheck/osmo-depcheck.py new file mode 100755 index 0000000..92c0ce6 --- /dev/null +++ b/scripts/osmo-depcheck/osmo-depcheck.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2018 sysmocom - s.f.m.c. GmbH + +import argparse +import os +import sys + +# Same folder +import config +import dependencies +import buildstack + + +def parse_arguments(): + # Create argparser + description = ("This script verifies that Osmocom programs really build" + " with the dependency versions they claim to support in" + " configure.ac. In order to do that, it clones the" + " dependency repositories if they don't exist in gitdir" + " already, and checks out the minimum version tag. This" + " happens recursively for their dependencies as well.") + parser = argparse.ArgumentParser(description=description) + + # Git sources folder + gitdir_default = os.path.expanduser("~") + "/code" + parser.add_argument("-g", "--gitdir", default=gitdir_default, + help="folder to which the sources will be cloned" + " (default: " + gitdir_default + ")") + + # Build switch + parser.add_argument("-b", "--build", action="store_true", + help="don't only parse the dependencies, but also try" + " to build the program") + + # Build switch + parser.add_argument("-o", "--old", action="store_true", + help="report dependencies on old releases") + + # Job count + parser.add_argument("-j", "--jobs", type=int, + help="parallel build jobs (for make)") + + # Git URL prefix + parser.add_argument("-u", "--git-url-prefix", dest="prefix", + default=config.git_url_prefix, + help="where to clone the sources from (default: " + + config.git_url_prefix + ")") + + # Projects + parser.add_argument("projects_revs", nargs="*", default=config.projects, + help="which Osmocom projects to look at" + " (e.g. 'osmo-hlr:0.2.1', 'osmo-bts', defaults to" + " all projects defined in config.py, default" + " revision is 'master')", + metavar="project[:revision]") + + # Gitdir must exist + ret = parser.parse_args() + if not os.path.exists(ret.gitdir): + print("ERROR: gitdir does not exist: " + ret.gitdir) + sys.exit(1) + return ret + + +def main(): + # Iterate over projects + args = parse_arguments() + for project_rev in args.projects_revs: + # Split the git revision from the project name + project = project_rev + rev = "master" + if ":" in project_rev: + project, rev = project_rev.split(":", 1) + + # Clone and parse the repositories + depends = dependencies.generate(args.gitdir, args.prefix, project, rev) + print("---") + dependencies.print_dict(depends) + stack = buildstack.generate(depends) + print("---") + buildstack.print_dict(stack) + + # Old versions + if args.old: + print("---") + dependencies.print_old(args.gitdir, depends) + + # Build + if args.build: + print("---") + buildstack.build(args.gitdir, args.jobs, stack) + + # Success + print("---") + print("Success for " + project + ":" + rev + "!") + print("---") + + +if __name__ == '__main__': + main() diff --git a/scripts/osmo-depcheck/parse.py b/scripts/osmo-depcheck/parse.py new file mode 100644 index 0000000..c6297d6 --- /dev/null +++ b/scripts/osmo-depcheck/parse.py @@ -0,0 +1,116 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2018 sysmocom - s.f.m.c. GmbH + +import sys +import fnmatch + +# Same folder +import config + + +def error(line_i, message): + """ Print a configure.ac error message with the line number. + :param line_i: the zero based line counter """ + print("ERROR: configure.ac line " + str(line_i+1) + ": " + message) + sys.exit(1) + + +def repository(library, version): + """ Find the git repository that contains a certain library. Based on the + information in config.py. + + :param library: the name as referenced in the PKG_CHECK_MODULES + statement. For example: "libosmoabis" + :param version: for example "0.5.0" + :returns: the repository name, e.g. "libosmo-abis" """ + for repo, libraries in config.repos.items(): + if library in libraries: + print(" * " + library + ":" + version + " (part of " + repo + ")") + return repo + + print(" * " + library + ":" + version) + return library + + +def library_is_relevant(library): + """ :returns: True when we would build the library in question from source, + False otherwise. """ + for pattern in config.relevant_library_patterns: + if fnmatch.fnmatch(library, pattern): + return True + return False + + +def parse_condition(line): + """ Find the PKG_CHECK_MODULES conditions in any line from a configure.ac. + + Example lines: + PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) + PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd) + + :returns: * None when there's no condition in that line + * a string like "libosmocore >= 0.1.0" """ + # Only look at PKG_CHECK_MODULES lines + if "PKG_CHECK_MODULES" not in line: + return + + # Extract the condition + ret = line.split(",")[1].split(")")[0].strip() + + # Only look at Osmocom libraries + library = ret.split(" ")[0] + if library_is_relevant(library): + return ret + + +def library_version(line_i, condition): + """ Get the library and version strings from a condition. + :param line_i: the zero based line counter + :param condition: a condition like "libosmocore >= 0.1.0" """ + # Split by space and remove empty list elements + split = list(filter(None, condition.split(" "))) + if len(split) != 3: + error(line_i, "invalid condition format, expected something" + " like 'libosmocore >= 0.10.0' but got: '" + + condition + "'") + library, operator, version = split + + # Right operator + if operator == ">=": + return (library, version) + + # Wrong operator + error(line_i, "invalid operator, expected '>=' but got: '" + + operator + "'") + + +def configure_ac(gitdir, repo): + """ Parse the PKG_CHECK_MODULES statements of a configure.ac file. + + :param gitdir: parent folder of all locally cloned git repositories + :param repo: the repository to look at (e.g. "osmo-bts") + :returns: a dictionary like the following: + {"libosmocore": "0.11.0", + "libosmo-abis": "0.5.0"} """ + # Read configure.ac + path = gitdir + "/" + repo + "/configure.ac" + with open(path) as handle: + lines = handle.readlines() + + # Parse the file into ret + ret = {} + for i in range(0, len(lines)): + # Parse the line + condition = parse_condition(lines[i]) + if not condition: + continue + (library, version) = library_version(i, condition) + + # Add to ret (with duplicate check) + repo_dependency = repository(library, version) + if repo_dependency in ret and version != ret[repo_dependency]: + error(i, "found multiple PKG_CHECK_MODULES statements for " + + repo_dependency + ".git, and they have different" + " versions!") + ret[repo_dependency] = version + return ret -- To view, visit https://gerrit.osmocom.org/10932 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: I8f495dbe030775f66ac125e60ded95c5d7660b65 Gerrit-Change-Number: 10932 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 09:46:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 09:46:36 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Create a common chapter for section documenting backends In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11039 ) Change subject: osmotrx: Create a common chapter for section documenting backends ...................................................................... osmotrx: Create a common chapter for section documenting backends Change-Id: I6bea1ccca4ce72b92641a36f9f5894ac9a6cae72 --- M OsmoTRX/chapters/trx-backends.adoc 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc index e801886..8829fa6 100644 --- a/OsmoTRX/chapters/trx-backends.adoc +++ b/OsmoTRX/chapters/trx-backends.adoc @@ -1,5 +1,8 @@ +[[trx_backends]] +== OsmoTRX backend support + [[backend_uhd]] -== `osmo-trx-uhd` for UHD based Transceivers +=== `osmo-trx-uhd` for UHD based Transceivers This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the device, that is configuring it and reading/writing samples from/to it. @@ -17,7 +20,7 @@ _osmo-trx.git_. [[backend_lms]] -== `osmo-trx-lms` for LimeSuite based Transceivers +=== `osmo-trx-lms` for LimeSuite based Transceivers This OsmoTRX model uses LimeSuite API and library to drive the device, that is configuring it and reading/writing samples from/to it. @@ -30,7 +33,7 @@ _osmo-trx.git_. [[backend_usrp1]] -== `osmo-trx-usrp1` for libusrp based Transceivers +=== `osmo-trx-usrp1` for libusrp based Transceivers This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2. -- To view, visit https://gerrit.osmocom.org/11039 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: I6bea1ccca4ce72b92641a36f9f5894ac9a6cae72 Gerrit-Change-Number: 11039 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 Fri Sep 21 09:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 09:46:37 +0000 Subject: Change in osmo-gsm-manuals[master]: osmotrx: Introduce code architecture chapter In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11040 ) Change subject: osmotrx: Introduce code architecture chapter ...................................................................... osmotrx: Introduce code architecture chapter Change-Id: I21084e6315d79a1adcb305e12343da218837dc31 --- A OsmoTRX/chapters/code-architecture.adoc M OsmoTRX/osmotrx-usermanual.adoc M common/chapters/trx_if.adoc 3 files changed, 145 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoTRX/chapters/code-architecture.adoc b/OsmoTRX/chapters/code-architecture.adoc new file mode 100644 index 0000000..18d0e3a --- /dev/null +++ b/OsmoTRX/chapters/code-architecture.adoc @@ -0,0 +1,141 @@ +[[code_architecture]] +== Code Architecture + +[[fig-code-architecture-general]] +.General overview of main OsmoTRX components +[graphviz] +---- +digraph hierarchy { +node[shape=record,style=filled,fillcolor=gray95] +edge[dir=back, arrowtail=empty] + +2[label = "{Transceiver|+ constructor()\l+ destructor()\l+ init()\l+ numChans()\l+ receiveFIFO()\l+ setSignalHandler()}"] +3[label = "{RadioInterface|...}"] +4[label = "{RadioInterfaceResamp|...}"] +5[label = "{RadioInterfaceMulti|...}"] +6[label = "{RadioDevice|...}"] +7[label = "{UHDDevice|...}"] +8[label = "{LMSDevice|...}"] +9[label = "{USRPDevice|...}"] + +2->3[arrowtail=odiamond] +3->4[constraint=false] +3->5[constraint=false] +3->6[arrowtail=odiamond] +6->7 +6->8 +6->9 +} +---- + +[[fig-code-architecture-threads]] +.Example of thread architecture with OsmoTRX configured to use 2 logical RF channels (Trx=Transceiver, RI=RadioIface) +[graphviz] +---- +digraph hierarchy { +node[shape=record,style=filled,fillcolor=gray95] + +trans [label="Transceiver"]; +radioiface [label="RadioInterface"]; +radiodev [label="RadioDevice"]; + +trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"]; +trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"]; +trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"]; +trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"]; +radioiface:e->trans:e [label="Trx.RxServiceLoop_0"]; +radioiface:e->trans:e [label="Trx.RxServiceLoop_1"]; +radioiface->radiodev[label="RI.AlignRadioServiceLoop"]; +radioiface:sw->radiodev:nw [label="Trx.TxLowerLoop"]; +radiodev:ne->radioiface:se [label="Trx.RxLowerLoop"]; +} +---- + +[[code_component_transceiver]] +=== Transceiver + +The Transceiver is the main component managing the other components running in +the OsmoTRX process. There's a unique instance per process. + +This class is quite complex from code point of view, as it starts lots of +different threads and hence the interaction with this class from the outside is +quite limited. Only interaction possible is to: + +* `Transceiver()`: Create an instance through its constructor, at this time most + configuration is handed to it. +* `init()`: Start running all the threads. +* `receiveFIFO()`: Attach a `radioInterface` channel FIFO in order to use it. +* `setSignalHandler()`: Used to set up a callback to receive certain events + asynchronously from the Transceiver. No assumptions can be made about from + which thread is the callback being called, which means multi-thread locking + precautions may be required in certain cases, similar to usual signal handler + processing. One important event received through this path is for instance + when the Transceiver detected a fatal error which requires it to stop. Since + it cannot stop itself (see destructor below), stopping procedure must be + delegated to the user who created the instance. +* `~Transceiver()`: The destructor, which stops all running threads created at + `init()` time. Destroying the object is the only way to stop the `Transceiver` + completely, and must be called from a thread not managed by the + `Transceiver`, otherwise it will deadlock. Usually it is stopped from the main + thread, the one that called the constructor during startup. + +During `init()` time, `Transceiver` will create a noticeable amount of threads, +which may vary depending on the amount of RF channels requested. + +Static amount of Threads (1 per `Transceiver` instance): + +* `RxLowerLoop`: This thread is responsible for reading bursts from the + `RadioInterface`, storing them into its FIFO and sending Clock Indications + (<>) to _osmo-bts_trx_. +* `TxLowerLoop`: Manages pushing bursts from buffers in the FIFO into the + `RadioInterface` at expected correct time based on the Transceiver clock. + +Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance): + +* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface + socket (<>). Each thread is responsible for managing one + socket related to one ARFCN or which is the same, to one RF logical channel. + These are the only threads expected to use the private `start()` and `stop()` + methods of the `Transceiver()` class, since those methods don't stop any of + the `ControlServiceLoop` threads as they must keep running to handle new + commands (for instance, to re-start processing samples with the _POWERON_ + command). +* `RxServiceLoop`: Each thread of this type pulls bursts from the + `RadioInterface` FIFO for one specific logical RF channel and handles it + according to the slot and burst correlation type, finally sending proper data + over the TRX Manager UDP socket (<>). +* `TxPriorityQueueServiceLoop`: Blocks reading from one ARFCN specific TRX + Manager UDP socket (<>), and fills the `RadioInterface` with it + setting clock related information. + +[[code_component_radioiface]] +=== RadioInterface + +The `RadioInterface` sits between the `Transceiver` and the `RadioDevice`, and +provides extra features to the pipe like channelizers, resamplers, Tx/Rx +synchronization on some devices, etc. + +If the `RadioDevice` it drives requires it (only _USRP1_ so far), the +`RadioIntercace` will start and manage a thread internally called +`AlignRadioServiceLoop` which will align current RX and TX timestamps. + +Different features are offered through different `RadioInterface` subclasses +which are selected based on configuration and device detected at runtime. Using +these features may impact on the amount of CPU required to run the entire pipe. + +==== RadioInterfaceResamp + +This subclass of `RadioInterface` is automatically selected when some known +specific UHD are to be used, since they require resampling to work properly. +Some of this devices are for instance Ettus B100, USRP2 and X3XX models. + +==== RadioInterfaceMulti + +This subclass of `RadioInterface` is used when <> is requested. + +[[code_component_radiodev]] +=== RadioDevice + +The `RadioDevice` class is responsible for driving the actual Hardware device. +It is actually only an interface, and it is implemented in each backend which in +turn becomes a specific OsmoTRX binary, see <>. diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index a713e4a..14f5514 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -29,6 +29,8 @@ include::chapters/trx-backends.adoc[] +include::chapters/code-architecture.adoc[] + include::../common/chapters/trx_if.adoc[] include::../common/chapters/port_numbers.adoc[] diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 4fb8f9b..b684b7b 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -11,6 +11,7 @@ every socket is at P+100. For any given build, the number of ARFCN interfaces can be fixed. +[[trx_if_clock_ind]] === Indications on the Master Clock Interface The master clock interface is output only (from the radio). @@ -24,6 +25,7 @@ IND CLOCK ---- +[[trx_if_control]] === Commands on the Per-ARFCN Control Interface The per-ARFCN control interface uses a command-reponse protocol. Commands are -- To view, visit https://gerrit.osmocom.org/11040 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: I21084e6315d79a1adcb305e12343da218837dc31 Gerrit-Change-Number: 11040 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 Fri Sep 21 10:51:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 10:51:27 +0000 Subject: Change in osmo-sip-connector[master]: Fix typo in -h: s/hekp/help Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11051 Change subject: Fix typo in -h: s/hekp/help ...................................................................... Fix typo in -h: s/hekp/help Change-Id: I5336212845acc221d50d0aa306cccc13723b9868 --- M src/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/51/11051/1 diff --git a/src/main.c b/src/main.c index c267f5f..560995e 100644 --- a/src/main.c +++ b/src/main.c @@ -79,7 +79,7 @@ static void print_help(void) { printf("OsmoSIPcon: MNCC to SIP bridge\n"); - printf(" -h --hekp\tthis text\n"); + printf(" -h --help\tthis text\n"); printf(" -c --config-file NAME\tThe config file to use [%s]\n", config_file); } -- To view, visit https://gerrit.osmocom.org/11051 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: I5336212845acc221d50d0aa306cccc13723b9868 Gerrit-Change-Number: 11051 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 12:25:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Sep 2018 12:25:20 +0000 Subject: Change in osmo-sip-connector[master]: Fix typo in -h: s/hekp/help In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11051 ) Change subject: Fix typo in -h: s/hekp/help ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11051 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: I5336212845acc221d50d0aa306cccc13723b9868 Gerrit-Change-Number: 11051 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Sep 2018 12:25: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 Sep 21 12:57:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 12:57:17 +0000 Subject: Change in osmo-gsm-tester[master]: Add dynts suite to test switch between PDCH and TCH Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11052 Change subject: Add dynts suite to test switch between PDCH and TCH ...................................................................... Add dynts suite to test switch between PDCH and TCH It seems for not yet clear reasons the MS require some time after the PDCH channels have been activated again to use them reliably. If no sleep is used between call hangup and gprs activate pdp ctx, the MS fails to activate the pdp ctx due to QMI error respone to the "Start network" requested. Related: OS#2582 Change-Id: I73b51c31309ac4c28c64ed7eb7c8c649e535aa22 --- M example/default-suites.conf A example/scenarios/mod-bts0-dynts67-ipa.conf A example/scenarios/mod-bts0-dynts67-osmo.conf A suites/dynts/suite.conf A suites/dynts/switch_tch_pdch.py 5 files changed, 142 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/52/11052/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 1857ba5..74f54a2 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -12,6 +12,8 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo +- dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 - nitb_sms:trx-b200 - sms:trx-b200 - nitb_ussd:trx-b200 @@ -26,6 +28,8 @@ - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 - nitb_ussd:trx-sysmocell5000 @@ -40,6 +44,8 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo +- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 @@ -51,6 +57,7 @@ - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 @@ -63,6 +70,7 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - nitb_smpp - smpp - encryption diff --git a/example/scenarios/mod-bts0-dynts67-ipa.conf b/example/scenarios/mod-bts0-dynts67-ipa.conf new file mode 100644 index 0000000..087b3b0 --- /dev/null +++ b/example/scenarios/mod-bts0-dynts67-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: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' diff --git a/example/scenarios/mod-bts0-dynts67-osmo.conf b/example/scenarios/mod-bts0-dynts67-osmo.conf new file mode 100644 index 0000000..3153120 --- /dev/null +++ b/example/scenarios/mod-bts0-dynts67-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: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' diff --git a/suites/dynts/suite.conf b/suites/dynts/suite.conf new file mode 100644 index 0000000..3b32480 --- /dev/null +++ b/suites/dynts/suite.conf @@ -0,0 +1,10 @@ +resources: + ip_address: + - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + bts: + - times: 1 + modem: + - times: 2 + features: + - gprs + - voice diff --git a/suites/dynts/switch_tch_pdch.py b/suites/dynts/switch_tch_pdch.py new file mode 100755 index 0000000..f0bbd38 --- /dev/null +++ b/suites/dynts/switch_tch_pdch.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + + +def activate_pdp(ms_mo, ms_mt): + # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) + ctx_id_v4_mo = ms_mo.activate_context(apn='inet46', protocol=ms_mo.CTX_PROT_IPv4) + print('ms_mo pdp ctx %r activated' % repr(ctx_id_v4_mo)) + ctx_id_v4_mt = ms_mt.activate_context(apn='inet46', protocol=ms_mt.CTX_PROT_IPv4) + print('ms_mt pdp ctx %r activated' % repr(ctx_id_v4_mt)) + sleep(5) + ms_mo.deactivate_context(ctx_id_v4_mo) + ms_mt.deactivate_context(ctx_id_v4_mt) + +def make_call(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_mo.call_hangup(mo_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') + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms_mo = suite.modem() +ms_mt = suite.modem() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) + +ms_mo.connect(msc.mcc_mnc()) +ms_mt.connect(msc.mcc_mnc()) +ms_mo.attach() +ms_mt.attach() + +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) +wait(msc.subscriber_attached, ms_mt) + +print('waiting for modems to attach to data services...') +wait(ms_mo.is_attached) +wait(ms_mt.is_attached) + +print('1: activate_pdp') +activate_pdp(ms_mo, ms_mt) +print('2: make_call') +make_call(ms_mo, ms_mt) +print('3: Wait 30 seconds to let PCU handle the PDCH channels again') +sleep(30) +print('3: activate_pdp') +activate_pdp(ms_mo, ms_mt) +print('4: make_call') +make_call(ms_mo, ms_mt) +print('Done!') -- To view, visit https://gerrit.osmocom.org/11052 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: I73b51c31309ac4c28c64ed7eb7c8c649e535aa22 Gerrit-Change-Number: 11052 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 Sep 21 13:00:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 13:00:52 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: don't use /tmp, better git code Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11053 Change subject: osmo-depcheck: don't use /tmp, better git code ...................................................................... osmo-depcheck: don't use /tmp, better git code * replace --gitdir with --workdir and give it a new folder structure: * git/$repo: downloaded source code * build/$repo: files created during the build process * install/: installation prefix * adjust the jenkins job to use --workdir * fetch --tags when source exists already * readable error message for failed git checkout Change-Id: I06589277b9d54a2af177451cfab2ca1a658b4058 Relates: OS#2642 --- M jobs/osmocom-depcheck.yml M scripts/osmo-depcheck/buildstack.py M scripts/osmo-depcheck/dependencies.py M scripts/osmo-depcheck/osmo-depcheck.py M scripts/osmo-depcheck/parse.py 5 files changed, 96 insertions(+), 68 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/53/11053/1 diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml index f13d4b7..fd2432e 100644 --- a/jobs/osmocom-depcheck.yml +++ b/jobs/osmocom-depcheck.yml @@ -52,13 +52,13 @@ # Build the arguments args="$PROJECTS" args="$args -j 5" - args="$args -g $PWD/DEPCHECK_GITDIR" + args="$args -w $PWD/DEPCHECK_WORKDIR" args="$args -u $GIT_URL_PREFIX" [ "$BUILD" = "true" ] && args="$args -b" [ "$PRINT_OLD_DEPENDS" = "true" ] && args="$args -o" # Run osmo-depcheck - mkdir DEPCHECK_GITDIR + mkdir DEPCHECK_WORKDIR export PYTHONUNBUFFERED=1 scripts/osmo-depcheck/osmo-depcheck.py $args scm: diff --git a/scripts/osmo-depcheck/buildstack.py b/scripts/osmo-depcheck/buildstack.py index 87210ab..0a9a011 100644 --- a/scripts/osmo-depcheck/buildstack.py +++ b/scripts/osmo-depcheck/buildstack.py @@ -70,29 +70,15 @@ print(" * " + program + ":" + version) -def temp_install_folder(): - """ Generate a temporary installation folder - - It will be used as configure prefix, so when running 'make install', - the files will get copied in there instead of "/usr/local/". The folder - will get removed when the script has finished. - - :returns: the path to the temporary folder """ - ret = tempfile.mkdtemp(prefix="depcheck_") - atexit.register(shutil.rmtree, ret) - print("Temporary install folder: " + ret) - return ret - - -def set_environment(jobs, tempdir): +def set_environment(jobs, prefix): """ Configure the environment variables before running configure, make etc. :param jobs: parallel build jobs (for make) - :param tempdir: temporary installation dir (see temp_install_folder()) + :param prefix: installation folder """ - # Add tempdir to PKG_CONFIG_PATH and LD_LIBRARY_PATH - extend = {"PKG_CONFIG_PATH": tempdir + "/lib/pkgconfig", - "LD_LIBRARY_PATH": tempdir + "/lib"} + # Add prefix to PKG_CONFIG_PATH and LD_LIBRARY_PATH + extend = {"PKG_CONFIG_PATH": prefix + "/lib/pkgconfig", + "LD_LIBRARY_PATH": prefix + "/lib"} for env_var, folder in extend.items(): old = os.environ[env_var] if env_var in os.environ else "" os.environ[env_var] = old + ":" + folder @@ -101,10 +87,10 @@ os.environ["JOBS"] = str(jobs) -def build(gitdir, jobs, stack): +def build(workdir, jobs, stack): """ Build one program with all its dependencies. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param jobs: parallel build jobs (for make) :param stack: the build stack as returned by generate() above @@ -122,18 +108,23 @@ anymore in case they decide to compile the code again manually from the source folder. """ # Prepare the install folder and environment - tempdir = temp_install_folder() - unitdir = tempdir + "/lib/systemd/system/" - set_environment(jobs, tempdir) + prefix = workdir + "/install" + unitdir = prefix + "/lib/systemd/system/" + set_environment(jobs, prefix) # Iterate over stack for program, version in stack.items(): print("Building " + program + ":" + version) - os.chdir(gitdir + "/" + program) + + # Create and enter the build folder + builddir = workdir + "/build/" + program + os.mkdir(builddir) + os.chdir(builddir) # Run the build commands - commands = [["autoreconf", "-fi"], - ["./configure", "--prefix", tempdir, + gitdir = workdir + "/git/" + program + commands = [["autoreconf", "-fi", gitdir], + [gitdir + "/configure", "--prefix", prefix, "--with-systemdsystemunitdir=" + unitdir], ["make", "clean"], ["make"], diff --git a/scripts/osmo-depcheck/dependencies.py b/scripts/osmo-depcheck/dependencies.py index 78cf4a0..9b5187d 100644 --- a/scripts/osmo-depcheck/dependencies.py +++ b/scripts/osmo-depcheck/dependencies.py @@ -10,37 +10,55 @@ import parse -def git_clone(gitdir, prefix, repository, version): +def git_clone(workdir, prefix, cache_git_fetch, repository, version): """ Clone a missing git repository and checkout a specific version tag. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param prefix: git url prefix (e.g. "git://git.osmocom.org/") + :param cache_git_fetch: list of repositories that have already been + fetched in this run of osmo-depcheck :param repository: Osmocom git repository name (e.g. "libosmo-abis") :param version: "master" or a version tag like "0.11.0" """ - # Clone when needed - if not os.path.exists(gitdir + "/" + repository): - url = prefix + repository - print("Cloning git repo: " + url) - try: - subprocess.run(["git", "-C", gitdir, "clone", "-q", url], + repodir = workdir + "/git/" + repository + if repository not in cache_git_fetch: + if os.path.exists(repodir): + # Fetch tags for existing source + print("Fetching tags...") + subprocess.run(["git", "-C", repodir, "fetch", "--tags", "-q"], check=True) - except subprocess.CalledProcessError: - print("NOTE: if '" + repository + "' is part of a git repository" - " with a different name, please add it to the mapping in" - " 'config.py' and try again.") - sys.exit(1) + else: + # Clone the source + url = prefix + repository + print("Cloning git repo: " + url) + try: + subprocess.run(["git", "-C", workdir + "/git", "clone", "-q", + url], check=True) + except subprocess.CalledProcessError: + print("NOTE: if '" + repository + "' is part of a git" + " repository with a different name, please add it to the" + " mapping in 'config.py' and try again.") + sys.exit(1) + + # Only fetch the same repository once per session + cache_git_fetch.append(repository) # Checkout the version tag - subprocess.run(["git", "-C", gitdir + "/" + repository, "checkout", - version, "-q"], check=True) + try: + subprocess.run(["git", "-C", repodir, "checkout", version, "-q"], + check=True) + except subprocess.CalledProcessError: + print("ERROR: git checkout failed! Invalid version specified?") + sys.exit(1) -def generate(gitdir, prefix, initial, rev): +def generate(workdir, prefix, cache_git_fetch, initial, rev): """ Generate the dependency graph of an Osmocom program by cloning the git repository, parsing the "configure.ac" file, and recursing. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param prefix: git url prefix (e.g. "git://git.osmocom.org/") + :param cache_git_fetch: list of repositories that have already been + fetched in this run of osmo-depcheck :param initial: the first program to look at (e.g. "osmo-bts") :param rev: the git revision to check out ("master", "0.1.0", ...) :returns: a dictionary like the following: @@ -65,8 +83,8 @@ # Add the programs dependencies to the stack print("Looking at " + program + ":" + version) - git_clone(gitdir, prefix, program, version) - depends = parse.configure_ac(gitdir, program) + git_clone(workdir, prefix, cache_git_fetch, program, version) + depends = parse.configure_ac(workdir, program) stack.update(depends) # Add the program to the ret @@ -86,28 +104,28 @@ print(" * " + program + ":" + version + " depends: " + str(depends)) -def git_latest_tag(gitdir, repository): +def git_latest_tag(workdir, repository): """ Get the last release string by asking git for the latest tag. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param repository: Osmocom git repository name (e.g. "libosmo-abis") :returns: the latest git tag (e.g. "1.0.2") """ - dir = gitdir + "/" + repository + dir = workdir + "/git/" + repository complete = subprocess.run(["git", "-C", dir, "describe", "--abbrev=0", "master"], check=True, stdout=subprocess.PIPE) return complete.stdout.decode().rstrip() -def print_old(gitdir, depends): +def print_old(workdir, depends): """ Print dependencies tied to an old release tag - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param depends: return value from generate() above """ print("Dependencies on old releases:") for program, data in depends.items(): for depend, version in data["depends"].items(): - latest = git_latest_tag(gitdir, depend) + latest = git_latest_tag(workdir, depend) if latest == version: continue print(" * " + program + ":" + data["version"] + " -> " + diff --git a/scripts/osmo-depcheck/osmo-depcheck.py b/scripts/osmo-depcheck/osmo-depcheck.py index 92c0ce6..7f701d6 100755 --- a/scripts/osmo-depcheck/osmo-depcheck.py +++ b/scripts/osmo-depcheck/osmo-depcheck.py @@ -4,6 +4,7 @@ import argparse import os +import shutil import sys # Same folder @@ -17,16 +18,16 @@ description = ("This script verifies that Osmocom programs really build" " with the dependency versions they claim to support in" " configure.ac. In order to do that, it clones the" - " dependency repositories if they don't exist in gitdir" + " dependency repositories if they don't exist in workdir" " already, and checks out the minimum version tag. This" " happens recursively for their dependencies as well.") parser = argparse.ArgumentParser(description=description) # Git sources folder - gitdir_default = os.path.expanduser("~") + "/code" - parser.add_argument("-g", "--gitdir", default=gitdir_default, + workdir_default = os.path.expanduser("~") + "/osmo-depcheck-work" + parser.add_argument("-w", "--workdir", default=workdir_default, help="folder to which the sources will be cloned" - " (default: " + gitdir_default + ")") + " (default: " + workdir_default + ")") # Build switch parser.add_argument("-b", "--build", action="store_true", @@ -55,17 +56,33 @@ " revision is 'master')", metavar="project[:revision]") - # Gitdir must exist + # Workdir must exist ret = parser.parse_args() - if not os.path.exists(ret.gitdir): - print("ERROR: gitdir does not exist: " + ret.gitdir) + if not os.path.exists(ret.workdir): + print("ERROR: workdir does not exist: " + ret.workdir) sys.exit(1) return ret +def workdir_prepare(workdir): + """ Delete old binaries and create the subfolders in workdir + :param workdir: path to where all data is stored """ + # Delete folders with binaries from previous runs + for subfolder in ("build", "install"): + full = workdir + "/" + subfolder + if os.path.exists(full): + shutil.rmtree(full) + + # Create all subfolders + for subfolder in ("build", "install", "git"): + os.makedirs(workdir + "/" + subfolder, exist_ok=True) + + def main(): - # Iterate over projects args = parse_arguments() + + # Iterate over projects + cache_git_fetch = [] for project_rev in args.projects_revs: # Split the git revision from the project name project = project_rev @@ -74,7 +91,9 @@ project, rev = project_rev.split(":", 1) # Clone and parse the repositories - depends = dependencies.generate(args.gitdir, args.prefix, project, rev) + workdir_prepare(args.workdir) + depends = dependencies.generate(args.workdir, args.prefix, + cache_git_fetch, project, rev) print("---") dependencies.print_dict(depends) stack = buildstack.generate(depends) @@ -84,12 +103,12 @@ # Old versions if args.old: print("---") - dependencies.print_old(args.gitdir, depends) + dependencies.print_old(args.workdir, depends) # Build if args.build: print("---") - buildstack.build(args.gitdir, args.jobs, stack) + buildstack.build(args.workdir, args.jobs, stack) # Success print("---") diff --git a/scripts/osmo-depcheck/parse.py b/scripts/osmo-depcheck/parse.py index c6297d6..06f932e 100644 --- a/scripts/osmo-depcheck/parse.py +++ b/scripts/osmo-depcheck/parse.py @@ -84,16 +84,16 @@ operator + "'") -def configure_ac(gitdir, repo): +def configure_ac(workdir, repo): """ Parse the PKG_CHECK_MODULES statements of a configure.ac file. - :param gitdir: parent folder of all locally cloned git repositories + :param workdir: path to where all data (git, build, install) is stored :param repo: the repository to look at (e.g. "osmo-bts") :returns: a dictionary like the following: {"libosmocore": "0.11.0", "libosmo-abis": "0.5.0"} """ # Read configure.ac - path = gitdir + "/" + repo + "/configure.ac" + path = workdir + "/git/" + repo + "/configure.ac" with open(path) as handle: lines = handle.readlines() -- To view, visit https://gerrit.osmocom.org/11053 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: I06589277b9d54a2af177451cfab2ca1a658b4058 Gerrit-Change-Number: 11053 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 13:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 13:03:45 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Add empty lines to easily spot different sections Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11054 Change subject: default-suites.conf: Add empty lines to easily spot different sections ...................................................................... default-suites.conf: Add empty lines to easily spot different sections Change-Id: If33fa9be091113d57b25dc3d73e277bbb3b0ce5a --- M example/default-suites.conf 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/54/11054/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 74f54a2..14e30d4 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -14,6 +14,7 @@ - gprs:sysmo+mod-bts0-dynts-osmo - dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:sysmo+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 + - nitb_sms:trx-b200 - sms:trx-b200 - nitb_ussd:trx-b200 @@ -30,6 +31,7 @@ - gprs:trx-b200+mod-bts0-dynts-osmo - dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 + - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 - nitb_ussd:trx-sysmocell5000 @@ -46,6 +48,7 @@ - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo - dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 + - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 @@ -58,6 +61,7 @@ - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa - dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 + - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 @@ -71,6 +75,7 @@ - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 + - nitb_smpp - smpp - encryption -- To view, visit https://gerrit.osmocom.org/11054 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: If33fa9be091113d57b25dc3d73e277bbb3b0ce5a Gerrit-Change-Number: 11054 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 Sep 21 13:05:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Sep 2018 13:05:14 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: don't use /tmp, better git code In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11053 ) Change subject: osmo-depcheck: don't use /tmp, better git code ...................................................................... Patch Set 1: Verified+1 Tested locally and with Jenkins: https://jenkins.osmocom.org/jenkins/job/Osmocom-depcheck/5/ -- To view, visit https://gerrit.osmocom.org/11053 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: I06589277b9d54a2af177451cfab2ca1a658b4058 Gerrit-Change-Number: 11053 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Sep 2018 13:05:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 13:08:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 13:08:54 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: don't use /tmp, better git code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11053 ) Change subject: osmo-depcheck: don't use /tmp, better git code ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11053/1/scripts/osmo-depcheck/dependencies.py File scripts/osmo-depcheck/dependencies.py: https://gerrit.osmocom.org/#/c/11053/1/scripts/osmo-depcheck/dependencies.py at 46 PS1, Line 46: try: This part probably belongs to a separate specific feature, and could easily go into a different patch. -- To view, visit https://gerrit.osmocom.org/11053 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: I06589277b9d54a2af177451cfab2ca1a658b4058 Gerrit-Change-Number: 11053 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Sep 2018 13:08:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 13:09:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Sep 2018 13:09:27 +0000 Subject: Change in osmo-sip-connector[master]: Fix typo in -h: s/hekp/help In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11051 ) Change subject: Fix typo in -h: s/hekp/help ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11051 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: I5336212845acc221d50d0aa306cccc13723b9868 Gerrit-Change-Number: 11051 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Sep 2018 13: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 Fri Sep 21 13:09:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Sep 2018 13:09:29 +0000 Subject: Change in osmo-sip-connector[master]: Fix typo in -h: s/hekp/help In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11051 ) Change subject: Fix typo in -h: s/hekp/help ...................................................................... Fix typo in -h: s/hekp/help Change-Id: I5336212845acc221d50d0aa306cccc13723b9868 --- M src/main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/src/main.c b/src/main.c index c267f5f..560995e 100644 --- a/src/main.c +++ b/src/main.c @@ -79,7 +79,7 @@ static void print_help(void) { printf("OsmoSIPcon: MNCC to SIP bridge\n"); - printf(" -h --hekp\tthis text\n"); + printf(" -h --help\tthis text\n"); printf(" -c --config-file NAME\tThe config file to use [%s]\n", config_file); } -- To view, visit https://gerrit.osmocom.org/11051 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: I5336212845acc221d50d0aa306cccc13723b9868 Gerrit-Change-Number: 11051 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 13:46:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 13:46:03 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Add osmo-iuh builds In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11029 ) Change subject: jobs: osmo-gsm-tester: Add osmo-iuh builds ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11029 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: I7b8f51597287e7673f79c65eae2508b074151781 Gerrit-Change-Number: 11029 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 21 Sep 2018 13:46: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 Sep 21 13:46:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 13:46:07 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11030 ) Change subject: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11030 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: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 Gerrit-Change-Number: 11030 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 21 Sep 2018 13:46:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 13:46:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 13:46:11 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verifica... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11038 ) Change subject: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11038 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: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a Gerrit-Change-Number: 11038 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 21 Sep 2018 13:46: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 Sep 21 14:22:56 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 14:22:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11055 Change subject: BSC_Tests: use consistant AMR S0-S15 bits ...................................................................... BSC_Tests: use consistant AMR S0-S15 bits At the moment we use the default S0-S15 bits for the AMR config, regardless what RSL_IE_Body mr_conf or osmo-bsc.cfg sets. - Make sure consistant S0-S15 bits are used for AMR related tests. Change-Id: I794e6d4fe8abc67337428cbe0bcc8802fae37a6e --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/11055/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a99214b..9a43ead 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1905,6 +1905,10 @@ testcase TC_assignment_codec_amr_f() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* Note: This setups the codec configuration. The parameter payload in + * mr_conf must be consistant with the parameter codecElements in pars + * and also must match the amr-config in osmo-bsc.cfg! */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1912,11 +1916,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1924,6 +1931,8 @@ testcase TC_assignment_codec_amr_h() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* See note above */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1931,11 +1940,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/11055 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: I794e6d4fe8abc67337428cbe0bcc8802fae37a6e Gerrit-Change-Number: 11055 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 14:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Sep 2018 14:25:06 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: drop redundant printf() call Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11056 Change subject: layer23/l1ctl.c: drop redundant printf() call ...................................................................... layer23/l1ctl.c: drop redundant printf() call Change-Id: I02bc581afb5a76c51fdef50ed40e2669c3eb3f2e --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/11056/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 3c57042..78e340b 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -226,7 +226,6 @@ } if (dl->fire_crc >= 2) { -printf("Dropping frame with %u bit errors\n", dl->num_biterr); LOGP(DL1C, LOGL_NOTICE, "Dropping frame with %u bit errors\n", dl->num_biterr); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/11056 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: I02bc581afb5a76c51fdef50ed40e2669c3eb3f2e Gerrit-Change-Number: 11056 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 14:25:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Sep 2018 14:25:07 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: replace printf() calls by LOGP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11057 Change subject: layer23/l1ctl.c: replace printf() calls by LOGP ...................................................................... layer23/l1ctl.c: replace printf() calls by LOGP Change-Id: I863fb668500b2010dfef7a63217255fd010c06d7 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/11057/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 78e340b..eedfb93 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -194,7 +194,7 @@ if (meas->dsc > meas->ds_fail) meas->dsc = meas->ds_fail; if (meas->dsc < meas->ds_fail) - printf("LOSS counter for CCCH %d\n", meas->dsc); + LOGP(DL1C, LOGL_INFO, "LOSS counter for CCCH %d\n", meas->dsc); if (meas->dsc > 0) break; meas->ds_fail = 0; @@ -216,7 +216,7 @@ if (meas->s > meas->rl_fail) meas->s = meas->rl_fail; if (meas->s < meas->rl_fail) - printf("LOSS counter for ACCH %d\n", meas->s); + LOGP(DL1C, LOGL_NOTICE, "LOSS counter for ACCH %d\n", meas->s); if (meas->s > 0) break; meas->rl_fail = 0; -- To view, visit https://gerrit.osmocom.org/11057 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: I863fb668500b2010dfef7a63217255fd010c06d7 Gerrit-Change-Number: 11057 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 14:47:40 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 14:47:40 +0000 Subject: Change in osmo-bsc[master]: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11058 Change subject: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() ...................................................................... gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() At the moment we do not initalize the struct members mr_full and mr_half in struct gsm_bts. The user still has the option to configure reasonable values via vty, but when not VTY configuration is made, the flags for the AMR rates will be all zero. Lets initalize the struct members with reasonable defaults. - Make sure gsm_bts_alloc() populates fr_half and fr_full with reasonable defaults. Change-Id: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Related: OS#3548 --- M src/osmo-bsc/gsm_data.c 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/11058/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 0718e91..6b4e5a7 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -774,6 +774,7 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) { struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); + struct gsm48_multi_rate_conf mr_cfg; int i; if (!bts) @@ -885,6 +886,33 @@ .amr = 1, }; + /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. + * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for + * the Adaptive Multi-Rate Codec Types. */ + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 1, + .m5_15 = 1, + .m5_90 = 1, + .m6_70 = 1, + .m7_40 = 1, + .m7_95 = 1, + .m10_2 = 1, + .m12_2 = 1 + }; + memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 1, + .m5_15 = 1, + .m5_90 = 1, + .m6_70 = 1, + .m7_40 = 1, + .m7_95 = 1, + .m10_2 = 0, + .m12_2 = 0 + }; + memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + return bts; } -- To view, visit https://gerrit.osmocom.org/11058 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: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Gerrit-Change-Number: 11058 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 14:47:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 14:47:41 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11060 Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (choosen) configuration bits with the assignment complete message. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 7 files changed, 89 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/1 diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 09aaa60..3085ad4 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -12,11 +12,11 @@ int match_codec_pref(enum gsm48_chan_mode *chan_mode, bool *full_rate, + uint16_t *s15_s0, const struct gsm0808_channel_type *ct, const struct gsm0808_speech_codec_list *scl, - struct gsm_audio_support * const *audio_support, - int audio_length, - const struct bts_codec_conf *bts_codec); + const struct bsc_msc_data *msc, + const struct gsm_bts *bts); void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 33a5a8d..7c91e59 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -109,6 +109,7 @@ enum gsm48_chan_mode chan_mode; bool full_rate; + uint16_t s15_s0; }; struct assignment_fsm_data { diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 5304d6c..221657e 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -169,8 +169,8 @@ * assignment complete message. */ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ - /* FIXME: AMR codec configuration must be derived from lchan1! */ gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc.cfg = conn->assignment.req.s15_s0; sc_ptr = ≻ } } diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index c998e60..7aa5130 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -94,14 +94,18 @@ * matches one of the permitted speech settings of the channel type element. * The matched permitted speech value is then also compared against the * speech codec list. (optional, only relevant for AoIP) */ -static bool test_codec_pref(const struct gsm0808_channel_type *ct, - const struct gsm0808_speech_codec_list *scl, uint8_t perm_spch) +static bool test_codec_pref(const struct gsm0808_speech_codec **sc_match, + const struct gsm0808_speech_codec_list *scl, + const struct gsm0808_channel_type *ct, + uint8_t perm_spch) { unsigned int i; bool match = false; struct gsm0808_speech_codec sc; int rc; + *sc_match = NULL; + /* Try to find the given permitted speech value in the * codec list of the channel type element */ for (i = 0; i < ct->perm_spch_len; i++) { @@ -129,8 +133,10 @@ /* Try to find extrapolated speech codec data in * the speech codec list */ for (i = 0; i < scl->len; i++) { - if (sc.type == scl->codec[i].type) + if (sc.type == scl->codec[i].type) { + *sc_match = &scl->codec[i]; return true; + } } return false; @@ -168,40 +174,74 @@ return false; } +/* Helper function to generate the bss supported amr configuration bits (S0-S15) */ +static uint16_t gen_bss_supported_amr_s15_s0(const struct bsc_msc_data *msc, const struct gsm_bts *bts, bool hr) +{ + const struct gsm48_multi_rate_conf *amr_cfg_bts; + const struct gsm48_multi_rate_conf *amr_cfg_msc; + uint16_t amr_s15_s0_bts; + uint16_t amr_s15_s0_msc; + + /* Lookup the BTS specific AMR rate configuration. Thsi config is set + * via the VTY for each BTS individually. In cases where no configuration + * is set we will assume a safe default */ + if (hr) { + amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; + amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, false); + } else { + amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, true); + } + + /* Lookup the AMR rate configuration that is set for the MSC */ + amr_cfg_msc = &msc->amr_conf; + amr_s15_s0_msc = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_msc, true); + + /* Calculate the intersection of the two configurations and update S0-S15 + * in the codec list. */ + return amr_s15_s0_bts & amr_s15_s0_msc; +} + /*! Match the codec preferences from local config with a received codec preferences IEs received from the * MSC and the BTS' codec configuration. * \param[out] chan_mode GSM 04.08 channel mode. * \param[out] full_rate true if full-rate. + * \param[out] s15_s0 codec configuration bits S15-S0 (AMR) * \param[in] ct GSM 08.08 channel type received from MSC. * \param[in] scl GSM 08.08 speech codec list received from MSC (optional). - * \param[in] audio_support List of allowed codecs as from local config. - * \param[in] audio_length Number of items in audio_support. - * \param[in] bts_codec BTS codec configuration. + * \param[in] msc associated msc (current codec settings). + * \param[in] bts associated bts (current codec settings). * \returns 0 on success, -1 in case no match was found */ int match_codec_pref(enum gsm48_chan_mode *chan_mode, bool *full_rate, + uint16_t *s15_s0, const struct gsm0808_channel_type *ct, const struct gsm0808_speech_codec_list *scl, - struct gsm_audio_support * const *audio_support, - int audio_length, - const struct bts_codec_conf *bts_codec) + const struct bsc_msc_data *msc, + const struct gsm_bts *bts) { unsigned int i; uint8_t perm_spch; bool match = false; + const struct gsm0808_speech_codec *sc_match = NULL; + uint16_t amr_s15_s0_supported; - for (i = 0; i < audio_length; i++) { + /* Note: Normally the MSC should never try to advertise a codec that + * we did not advertise as supported before. In order to ensure that + * no unsupported codec is accepted, we make sure that the codec is + * indeed available with the current BTS and MSC configuration */ + for (i = 0; i < msc->audio_length; i++) { /* Pick a permitted speech value from the global codec configuration list */ - perm_spch = audio_support_to_gsm88(audio_support[i]); + perm_spch = audio_support_to_gsm88(msc->audio_support[i]); /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ - if (!test_codec_support_bts(bts_codec, perm_spch)) + if (!test_codec_support_bts(&bts->codec, perm_spch)) continue; /* Match the permitted speech value against the codec lists that were * advertised by the MS and the MSC */ - if (test_codec_pref(ct, scl, perm_spch)) { + if (test_codec_pref(&sc_match, scl, ct, perm_spch)) { match = true; break; } @@ -211,6 +251,7 @@ if (!match) { *full_rate = false; *chan_mode = GSM48_CMODE_SIGN; + *s15_s0 = 0; return -1; } @@ -240,6 +281,24 @@ /* Lookup a channel mode for the selected codec */ *chan_mode = gsm88_to_chan_mode(perm_spch); + /* Special handling for AMR */ + if (perm_spch == GSM0808_PERM_HR3 || perm_spch == GSM0808_PERM_FR3) + { + /* Normally the MSC should never try to advertise an AMR codec + * configuration that we did not previously advertised as + * supported. However, to ensure that no unsupported AMR codec + * configuration enters the further processing steps we agein + * lookup what we support and generate an intersection. All + * further processing is then done with this intersection + * result */ + amr_s15_s0_supported = gen_bss_supported_amr_s15_s0(msc, bts, (perm_spch == GSM0808_PERM_HR3)); + if (sc_match) + *s15_s0 = sc_match->cfg & amr_s15_s0_supported; + else + *s15_s0 = amr_s15_s0_supported; + } else + *s15_s0 = 0; + return 0; } @@ -254,11 +313,6 @@ uint8_t perm_spch; unsigned int i; int rc; - uint16_t amr_s15_s0_bts; - uint16_t amr_s15_s0_msc; - uint16_t amr_s15_s0; - const struct gsm48_multi_rate_conf *amr_cfg_bts; - const struct gsm48_multi_rate_conf *amr_cfg_msc; memset(scl, 0, sizeof(*scl)); @@ -280,28 +334,8 @@ /* AMR (HR/FR version 3) is the only codec that requires a codec * configuration (S0-S15). Determine the current configuration and update * the cfg flag. */ - if (msc->audio_support[i]->ver == 3) { - - /* First lookup the BTS specific AMR rate configuration. Thsi config - * is set via the VTY for each BTS individually. In cases where no - * configuration is set we will assume a safe default */ - if (msc->audio_support[i]->hr) { - amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; - amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, false); - } else { - amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; - amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, true); - } - - /* At next, lookup the AMR rate configuration that is set for the MSC */ - amr_cfg_msc = &msc->amr_conf; - amr_s15_s0_msc = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_msc, true); - - /* Calculate the intersection of the two configurations and update S0-S15 - * in the codec list. */ - amr_s15_s0 = amr_s15_s0_bts & amr_s15_s0_msc; - scl->codec[scl->len].cfg = amr_s15_s0; - } + if (msc->audio_support[i]->ver == 3) + scl->codec[scl->len].cfg = gen_bss_supported_amr_s15_s0(msc, bts, msc->audio_support[i]->hr); scl->len++; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 9d558bc..e95ab9c 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -522,6 +522,7 @@ int match_idx; enum gsm48_chan_mode mode; bool full_rate; + uint16_t s15_s0; struct osmo_fsm_inst *fi; handover_fsm_alloc(conn); @@ -560,8 +561,9 @@ bts->nr, req->cell_id_target_name); /* Figure out channel type */ - if (match_codec_pref(&mode, &full_rate, &req->ct, &req->scl, msc->audio_support, - msc->audio_length, &bts->codec)) { + if (match_codec_pref(&mode, &full_rate, &s15_s0, &req->ct, &req->scl, msc, bts)) { + /* FIXME: use the value in s15_s0 that has been computed by + * match_codec_pref(). */ LOG_HO(conn, LOGL_DEBUG, "BTS %u has no matching channel codec (%s, speech codec list len = %u)", bts->nr, gsm0808_channel_type_name(&req->ct), req->scl.len); diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 97daa5c..537b851 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -603,6 +603,7 @@ uint16_t cic = 0; enum gsm48_chan_mode chan_mode = GSM48_CMODE_SIGN; bool full_rate = false; + uint16_t s15_s0 = 0; bool aoip = false; struct sockaddr_storage rtp_addr; struct gsm0808_channel_type ct; @@ -706,9 +707,8 @@ /* Match codec information from the assignment command against the * local preferences of the BSC and BTS */ - rc = match_codec_pref(&chan_mode, &full_rate, &ct, &conn->codec_list, - msc->audio_support, msc->audio_length, - &conn_get_bts(conn)->codec); + rc = match_codec_pref(&chan_mode, &full_rate, &s15_s0, &ct, &conn->codec_list, + msc, conn_get_bts(conn)); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "No supported audio type found for channel_type =" " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", @@ -730,6 +730,7 @@ .msc_assigned_cic = cic, .chan_mode = chan_mode, .full_rate = full_rate, + .s15_s0 = s15_s0 }; if (aoip) { unsigned int rc = osmo_sockaddr_to_str_and_uint(req.msc_rtp_addr, diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index 20e3525..34b8c75 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -374,6 +374,7 @@ unsigned int i; bool full_rate; enum gsm48_chan_mode chan_mode; + uint16_t s15_s0; printf("Determining channel mode and rate:\n"); @@ -398,7 +399,7 @@ printf(" codec->efr=%u\n", bts->codec.efr); printf(" codec->amr=%u\n", bts->codec.amr); - rc = match_codec_pref(&chan_mode, &full_rate, ct, scl, msc->audio_support, msc->audio_length, &bts->codec); + rc = match_codec_pref(&chan_mode, &full_rate, &s15_s0, ct, scl, msc, bts); printf(" * result: rc=%i, full_rate=%i, chan_mode=%s\n", rc, full_rate, gsm48_chan_mode_name(chan_mode)); printf("\n"); -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 14:47:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 14:47:41 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: only include speech codec (choosen) on AoIP networks Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11059 Change subject: assignment_fsm: only include speech codec (choosen) on AoIP networks ...................................................................... assignment_fsm: only include speech codec (choosen) on AoIP networks The field speech codec (choosen) in the ASSIGNMENT COMPLETE message has been specified with AoIP. Since sccp-lite has been specified before AoIP, we should not include the speech codec (choosen) field in the ASSIGNMENT COMPLETE, when osmo-bsc is connected to an sccp-lite based network. - make sure speech codec (choosen) is only included on AoIP based networks Change-Id: Ic7f28aacc953d96ebf3aa04f3e1810475458c1a8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/11059/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 63776f0..5304d6c 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -165,10 +165,14 @@ addr_local_p = &addr_local; } - /* Extrapolate speech codec from speech mode */ - /* FIXME: AMR codec configuration must be derived from lchan1! */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ + /* Only AoIP networks include a speech codec (choosen) in the + * assignment complete message. */ + if (gscon_is_aoip(conn)) { + /* Extrapolate speech codec from speech mode */ + /* FIXME: AMR codec configuration must be derived from lchan1! */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ + } } resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, -- To view, visit https://gerrit.osmocom.org/11059 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: Ic7f28aacc953d96ebf3aa04f3e1810475458c1a8 Gerrit-Change-Number: 11059 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 21 14:48:42 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 14:48:42 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (choosen) configuration bits with the assignment complete message. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c 7 files changed, 89 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/2 -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 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 Sep 21 14:58:05 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 14:58:05 +0000 Subject: Change in libosmocore[master]: gsm0808_utils: constify parameter In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11049 ) Change subject: gsm0808_utils: constify parameter ...................................................................... gsm0808_utils: constify parameter parameter cfg in gsm0808_sc_cfg_from_gsm48_mr_cfg() is used read only. Lets add a const to make this clear to the compiler. Change-Id: I31e8d273b070b0afc446a298299d4f502d6c396b --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 0a7429e..8746ceb 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -104,7 +104,7 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, bool fr); +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 4b2a5f5..0d6938e 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1166,7 +1166,7 @@ * \param[in] cfg AMR configuration in GSM 04.08 format. * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. * \returns configuration bits (S0-S15) */ -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(struct gsm48_multi_rate_conf *cfg, +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr) { uint16_t s15_s0 = 0; -- To view, visit https://gerrit.osmocom.org/11049 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: I31e8d273b070b0afc446a298299d4f502d6c396b Gerrit-Change-Number: 11049 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 21 15:14:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 21 Sep 2018 15:14:27 +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_#253?= In-Reply-To: <1708472561.198.1537456206662.JavaMail.jenkins@jenkins.osmocom.org> References: <1708472561.198.1537456206662.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <623110857.205.1537542867406.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 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_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_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 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_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_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_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 -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_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_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.... 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 Sep 21 15:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Sep 2018 15:42:52 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11060 to look at the new patch set (#3). Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (choosen) configuration bits with the assignment complete message. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 8 files changed, 139 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/3 -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 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 Fri Sep 21 17:52:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 21 Sep 2018 17:52:08 +0000 Subject: Change in osmo-bts[master]: lc15: led_sleep_cb: pass correct ptr to llist_move_tail In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9534 ) Change subject: lc15: led_sleep_cb: pass correct ptr to llist_move_tail ...................................................................... lc15: led_sleep_cb: pass correct ptr to llist_move_tail Fix compilation warning. At runtime it's not a big issue because the "list" field is the first field of the led_list (struct lc15bts_led_timer_list) variable. Hence, the address passed is the same. Change-Id: Ib8bf07990800d74bfb3ad7a55eccfc65e40cd480 --- M src/osmo-bts-litecell15/misc/lc15bts_led.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-litecell15/misc/lc15bts_led.c b/src/osmo-bts-litecell15/misc/lc15bts_led.c index 603e0fb..a93d3fb 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_led.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_led.c @@ -151,7 +151,7 @@ /* Delete current timer */ osmo_timer_del(&led_list->led_timer.timer); /* Rotate the timer list */ - llist_move_tail(led_list, &mgr->lc15bts_leds.list); + llist_move_tail(&led_list->list, &mgr->lc15bts_leds.list); break; } } -- To view, visit https://gerrit.osmocom.org/9534 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: Ib8bf07990800d74bfb3ad7a55eccfc65e40cd480 Gerrit-Change-Number: 9534 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 Fri Sep 21 19:28:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Sep 2018 19:28:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP: implement SRI_FOR_SM message support Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11061 Change subject: library/GSUP: implement SRI_FOR_SM message support ...................................................................... library/GSUP: implement SRI_FOR_SM message support According to 3GPP TS 29.002, section 12.1 the SRI_FOR_SM message (a.k.a MAP-SEND-ROUTING-INFO-FOR-SM) is used to retrieve the routing information needed for routing a short message to the servicing node of subscriber. Please note that only the 'must-have' fields of SRI_FOR_SM are introduced by this change, in particular: - GSUP_MSGT_SRI_FOR_SM_REQUEST (MAP Request) - GSUP_MSISDN_IE - GSUP_SM_RP_RPI_IE - GSUP_SMSC_ADDR_IE - GSUP_MSGT_SRI_FOR_SM_RESULT (MAP Response) - GSUP_IMSI_IE - GSUP_NODE_ADDR_IE - GSUP_MSGT_SRI_FOR_SM_ERROR (MAP Response) - GSUP_CAUSE_IE (MAP User Error, see 7.6.1) Since there is no TCAP layer in GSUP, the context is emulated using the session management IEs, in particular using the GSUP_SESSION_ID_IE. The session state IE isn't used due to the 'REQ-RSP' nature of this message. Change-Id: I7c1a882748d82ed5ef0b22cf1ae5764da5e874a0 --- M library/GSUP_Types.ttcn 1 file changed, 141 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/11061/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 7680815..80b8e2e 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -31,6 +31,11 @@ OSMO_GSUP_PDP_QOS_IE ('13'O), OSMO_GSUP_CHARG_CHAR_IE ('14'O), + /* FIXME: should we reserve a separate range (e.g. 0x40) for SM? */ + OSMO_GSUP_SMSC_ADDR ('15'O), + OSMO_GSUP_NODE_ADDR ('16'O), + OSMO_GSUP_SM_RP_RPI ('17'O), + OSMO_GSUP_RAND_IE ('20'O), OSMO_GSUP_SRES_IE ('21'O), OSMO_GSUP_KC_IE ('22'O), @@ -75,7 +80,12 @@ OSMO_GSUP_MSGT_PROC_SS_REQUEST ('00100000'B), OSMO_GSUP_MSGT_PROC_SS_ERROR ('00100001'B), - OSMO_GSUP_MSGT_PROC_SS_RESULT ('00100010'B) + OSMO_GSUP_MSGT_PROC_SS_RESULT ('00100010'B), + + /* FIXME: 0b001001? any ideas? */ + OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST ('00100100'B), + OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR ('00100101'B), + OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT ('00100110'B) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { @@ -128,6 +138,9 @@ session_state, tag = OSMO_GSUP_SESSION_STATE_IE; session_id, tag = OSMO_GSUP_SESSION_ID_IE; ss_info, tag = OSMO_GSUP_SS_INFO_IE; + smsc_addr, tag = OSMO_GSUP_SMSC_ADDR; + node_addr, tag = OSMO_GSUP_NODE_ADDR; + sm_rp_rpi, tag = OSMO_GSUP_SM_RP_RPI; )" }; @@ -161,7 +174,11 @@ GSUP_SessionState session_state, OCT4 session_id, /* Supplementary Services */ - octetstring ss_info + octetstring ss_info, + /* Short Message Service */ + octetstring smsc_addr, /* FIXME: octetstring? */ + octetstring node_addr, /* FIXME: octetstring? */ + boolean sm_rp_rpi /* FIXME: boolean? */ }; type record GSUP_PDU { @@ -593,6 +610,51 @@ } } +template (value) GSUP_IE ts_GSUP_IE_SMSC_ADDR(octetstring addr) := { + tag := OSMO_GSUP_SMSC_ADDR, + len := 0, /* overwritten */ + val := { + smsc_addr := addr + } +} +template GSUP_IE tr_GSUP_IE_SMSC_ADDR(template octetstring addr) := { + tag := OSMO_GSUP_SMSC_ADDR, + len := ?, + val := { + smsc_addr := addr + } +} + +template (value) GSUP_IE ts_GSUP_IE_NODE_ADDR(octetstring addr) := { + tag := OSMO_GSUP_NODE_ADDR, + len := 0, /* overwritten */ + val := { + node_addr := addr + } +} +template GSUP_IE tr_GSUP_IE_NODE_ADDR(template octetstring addr) := { + tag := OSMO_GSUP_NODE_ADDR, + len := ?, + val := { + node_addr := addr + } +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_RPI(boolean val) := { + tag := OSMO_GSUP_SM_RP_RPI, + len := 0, /* overwritten */ + val := { + sm_rp_rpi := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_RPI(template boolean val) := { + tag := OSMO_GSUP_SM_RP_RPI, + len := ?, + val := { + sm_rp_rpi := val + } +} + template (value) GSUP_IE ts_GSUP_IE_SSInfo(octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := 0, /* overwritten */ @@ -714,6 +776,83 @@ } ); +template (value) GSUP_PDU ts_GSUP_SRI_FOR_SM_REQ( + OCT4 sid, /* TCAP TransactionID */ + /* TODO: having IMSI instead of MSISDN is also legal */ + hexstring msisdn, /* MSISDN of subscriber */ + boolean sm_rp_rpi, /* See 3GPP TS 29.002, 7.6.8.5 */ + octetstring smsc_addr /* Address of SMSC */ +) := ts_GSUP( + OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_MSISDN(msisdn)), + valueof(ts_GSUP_IE_SM_RP_RPI(sm_rp_rpi)), + valueof(ts_GSUP_IE_SMSC_ADDR(smsc_addr)) + } +); +template GSUP_PDU tr_GSUP_SRI_FOR_SM_REQ( + template OCT4 sid := ?, /* TCAP TransactionID */ + /* TODO: having IMSI instead of MSISDN is also legal */ + template hexstring msisdn, /* MSISDN of subscriber */ + template boolean sm_rp_rpi, /* See 3GPP TS 29.002, 7.6.8.5 */ + template octetstring smsc_addr /* Address of SMSC */ +) := tr_GSUP( + OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_MSISDN(msisdn), + tr_GSUP_IE_SM_RP_RPI(sm_rp_rpi), + tr_GSUP_IE_SMSC_ADDR(smsc_addr) + } +); + +template (value) GSUP_PDU ts_GSUP_SRI_FOR_SM_RES( + OCT4 sid, /* TCAP TransactionID */ + hexstring imsi, /* IMSI of subscriber */ + octetstring node_addr /* Address of serving node (e.g. HLR) */ +) := ts_GSUP( + OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_NODE_ADDR(node_addr)) + } +); +template GSUP_PDU tr_GSUP_SRI_FOR_SM_RES( + template OCT4 sid := ?, /* TCAP TransactionID */ + template hexstring imsi, /* IMSI of subscriber */ + template octetstring node_addr /* Address of serving node (e.g. HLR) */ +) := tr_GSUP( + OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_NODE_ADDR(node_addr) + } +); + +template (value) GSUP_PDU ts_GSUP_SRI_FOR_SM_ERR( + OCT4 sid, /* TCAP TransactionID */ + integer cause /* User error, see 12.1.3 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_Cause(cause)) + } +); +template GSUP_PDU tr_GSUP_SRI_FOR_SM_ERR( + template OCT4 sid := ?, /* TCAP TransactionID */ + template integer cause := ? /* User error, see 12.1.3 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_Cause(cause) + } +); + 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) { -- To view, visit https://gerrit.osmocom.org/11061 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: I7c1a882748d82ed5ef0b22cf1ae5764da5e874a0 Gerrit-Change-Number: 11061 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 21 20:39:00 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:39:00 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5ba556fabaf23_3a78fa468c384156@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 189s] No package 'libpcsclite' found [ 189s] simtrace2-remsim.o: In function `main': [ 189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 189s] apdu_dispatch.o: In function `apdu_segment_in': [ 189s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 189s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 189s] collect2: error: ld returned 1 exit status [ 189s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 189s] make[2]: *** [simtrace2-remsim] Error 1 [ 189s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 189s] Makefile:20: recipe for target 'utils' failed [ 189s] make[1]: *** [utils] Error 2 [ 189s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 189s] dh_auto_build: make -j1 returned exit code 2 [ 189s] debian/rules:4: recipe for target 'build' failed [ 189s] make: *** [build] Error 2 [ 189s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 189s] [ 189s] cloud127 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:38:46 UTC 2018. [ 189s] [ 189s] ### VM INTERACTION START ### [ 192s] [ 166.605812] sysrq: SysRq : Power Off [ 192s] [ 166.646940] reboot: Power down [ 193s] ### VM INTERACTION END ### [ 193s] [ 193s] cloud127 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:38:51 UTC 2018. [ 193s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 20:39:18 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:39:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5ba556fbb563d_3a78fa468c3843f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 207s] No package 'libpcsclite' found [ 207s] simtrace2-remsim.o: In function `main': [ 207s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 207s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 207s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 207s] apdu_dispatch.o: In function `apdu_segment_in': [ 207s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 207s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 207s] collect2: error: ld returned 1 exit status [ 207s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 207s] make[2]: *** [simtrace2-remsim] Error 1 [ 207s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 207s] Makefile:20: recipe for target 'utils' failed [ 207s] make[1]: *** [utils] Error 2 [ 207s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 207s] dh_auto_build: make -j1 returned exit code 2 [ 207s] debian/rules:4: recipe for target 'build' failed [ 207s] make: *** [build] Error 2 [ 208s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 208s] [ 208s] cloud123 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:39:09 UTC 2018. [ 208s] [ 208s] ### VM INTERACTION START ### [ 211s] [ 185.133410] sysrq: SysRq : Power Off [ 211s] [ 185.154238] reboot: Power down [ 213s] ### VM INTERACTION END ### [ 214s] [ 214s] cloud123 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:39:16 UTC 2018. [ 214s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 20:41:18 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:41:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5ba557733d10c_3a78fa468c38452d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 202s] No package 'libpcsclite' found [ 202s] simtrace2-remsim.o: In function `main': [ 202s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 202s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 202s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 202s] apdu_dispatch.o: In function `apdu_segment_in': [ 202s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 202s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 202s] collect2: error: ld returned 1 exit status [ 202s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 202s] make[2]: *** [simtrace2-remsim] Error 1 [ 202s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 202s] Makefile:20: recipe for target 'utils' failed [ 202s] make[1]: *** [utils] Error 2 [ 202s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 202s] dh_auto_build: make -j1 returned exit code 2 [ 202s] debian/rules:4: recipe for target 'build' failed [ 202s] make: *** [build] Error 2 [ 202s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 202s] [ 202s] cloud113 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:41:01 UTC 2018. [ 202s] [ 202s] ### VM INTERACTION START ### [ 205s] [ 180.637796] sysrq: SysRq : Power Off [ 205s] [ 180.691863] reboot: Power down [ 207s] ### VM INTERACTION END ### [ 207s] [ 207s] cloud113 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:41:07 UTC 2018. [ 207s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 20:49:01 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:49:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5ba55951e7f27_3a78fa468c384960@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 158s] No package 'libpcsclite' found [ 158s] simtrace2-remsim.o: In function `main': [ 158s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 158s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 158s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 158s] apdu_dispatch.o: In function `apdu_segment_in': [ 158s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 158s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 158s] collect2: error: ld returned 1 exit status [ 158s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 158s] make[2]: *** [simtrace2-remsim] Error 1 [ 158s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 158s] Makefile:20: recipe for target 'utils' failed [ 158s] make[1]: *** [utils] Error 2 [ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 158s] dh_auto_build: make -j1 returned exit code 2 [ 158s] debian/rules:4: recipe for target 'build' failed [ 158s] make: *** [build] Error 2 [ 158s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 158s] [ 158s] wildcard2 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:48:52 UTC 2018. [ 158s] [ 158s] ### VM INTERACTION START ### [ 161s] [ 145.092648] sysrq: SysRq : Power Off [ 161s] [ 145.097021] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] wildcard2 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:48:58 UTC 2018. [ 163s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 20:49:35 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:49:35 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5ba5596caa82f_3a78fa468c3851a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 190s] No package 'libpcsclite' found [ 190s] simtrace2-remsim.o: In function `main': [ 190s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 190s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 190s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 190s] apdu_dispatch.o: In function `apdu_segment_in': [ 190s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 190s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 190s] collect2: error: ld returned 1 exit status [ 190s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 190s] make[2]: *** [simtrace2-remsim] Error 1 [ 190s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 190s] Makefile:20: recipe for target 'utils' failed [ 190s] make[1]: *** [utils] Error 2 [ 190s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 190s] dh_auto_build: make -j1 returned exit code 2 [ 190s] debian/rules:4: recipe for target 'build' failed [ 190s] make: *** [build] Error 2 [ 190s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 190s] [ 190s] lamb59 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:49:22 UTC 2018. [ 190s] [ 190s] ### VM INTERACTION START ### [ 193s] [ 179.977218] sysrq: SysRq : Power Off [ 193s] [ 179.988406] reboot: Power down [ 193s] ### VM INTERACTION END ### [ 193s] [ 193s] lamb59 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:49:26 UTC 2018. [ 193s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 20:50:09 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:50:09 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5ba5598bcf339_3a78fa468c38527e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 116s] No package 'libpcsclite' found [ 116s] simtrace2-remsim.o: In function `main': [ 116s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 116s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 116s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 116s] apdu_dispatch.o: In function `apdu_segment_in': [ 116s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 116s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 116s] collect2: error: ld returned 1 exit status [ 116s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 116s] make[2]: *** [simtrace2-remsim] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 116s] Makefile:20: recipe for target 'utils' failed [ 116s] make[1]: *** [utils] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] dh_auto_build: make -j1 returned exit code 2 [ 116s] debian/rules:4: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 116s] [ 116s] build74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:50:00 UTC 2018. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 107.444770] sysrq: SysRq : Power Off [ 119s] [ 107.454946] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] build74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:50:05 UTC 2018. [ 120s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 20:55:18 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 20:55:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5ba55aba43764_3a78fa468c385822@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 224s] No package 'libpcsclite' found [ 224s] simtrace2-remsim.o: In function `main': [ 224s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 224s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 224s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 224s] apdu_dispatch.o: In function `apdu_segment_in': [ 224s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 224s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 224s] collect2: error: ld returned 1 exit status [ 224s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 224s] make[2]: *** [simtrace2-remsim] Error 1 [ 224s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 224s] Makefile:20: recipe for target 'utils' failed [ 224s] make[1]: *** [utils] Error 2 [ 224s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 224s] dh_auto_build: make -j1 returned exit code 2 [ 224s] debian/rules:4: recipe for target 'build' failed [ 224s] make: *** [build] Error 2 [ 224s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 224s] [ 224s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:55:03 UTC 2018. [ 224s] [ 224s] ### VM INTERACTION START ### [ 227s] [ 212.489767] sysrq: SysRq : Power Off [ 227s] [ 212.495885] reboot: Power down [ 227s] ### VM INTERACTION END ### [ 227s] [ 227s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 20:55:07 UTC 2018. [ 227s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 21:09:00 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 21:09:00 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5ba55e0076b22_3a78fa468c3873c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 558s] No package 'libpcsclite' found [ 558s] simtrace2-remsim.o: In function `main': [ 558s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 558s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 558s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 558s] apdu_dispatch.o: In function `apdu_segment_in': [ 558s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 558s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 558s] collect2: error: ld returned 1 exit status [ 558s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 558s] make[2]: *** [simtrace2-remsim] Error 1 [ 558s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 558s] Makefile:20: recipe for target 'utils' failed [ 558s] make[1]: *** [utils] Error 2 [ 558s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 558s] dh_auto_build: make -j1 returned exit code 2 [ 558s] debian/rules:4: recipe for target 'build' failed [ 558s] make: *** [build] Error 2 [ 558s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 558s] [ 558s] lamb24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 21:08:49 UTC 2018. [ 558s] [ 558s] ### VM INTERACTION START ### [ 562s] [ 534.604691] sysrq: SysRq : Power Off [ 562s] [ 534.664991] reboot: Power down [ 562s] ### VM INTERACTION END ### [ 562s] [ 562s] lamb24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 21:08:54 UTC 2018. [ 562s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 21 21:14:43 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 21 Sep 2018 21:14:43 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ba55f4c6562f_3a78fa468c3877a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 317s] No package 'libpcsclite' found [ 317s] simtrace2-remsim.o: In function `main': [ 317s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 317s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 317s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 317s] apdu_dispatch.o: In function `apdu_segment_in': [ 317s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 317s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 317s] collect2: error: ld returned 1 exit status [ 317s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 317s] make[2]: *** [simtrace2-remsim] Error 1 [ 317s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 317s] Makefile:20: recipe for target 'utils' failed [ 317s] make[1]: *** [utils] Error 2 [ 317s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 317s] dh_auto_build: make -j1 returned exit code 2 [ 317s] debian/rules:4: recipe for target 'build' failed [ 317s] make: *** [build] Error 2 [ 317s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 317s] [ 317s] armbuild02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 21:14:23 UTC 2018. [ 317s] [ 317s] ### VM INTERACTION START ### [ 320s] [ 265.605575] SysRq : Power Off [ 320s] [ 265.654093] reboot: Power down [ 321s] ### VM INTERACTION END ### [ 321s] [ 321s] armbuild02 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Fri Sep 21 21:14:27 UTC 2018. [ 321s] -- 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 Sep 22 11:35:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Sep 2018 11:35:27 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: replace printf() calls by LOGP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11057 ) Change subject: layer23/l1ctl.c: replace printf() calls by LOGP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11057 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: I863fb668500b2010dfef7a63217255fd010c06d7 Gerrit-Change-Number: 11057 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Sep 2018 11:35:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 22 11:35:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Sep 2018 11:35:34 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: drop redundant printf() call In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11056 ) Change subject: layer23/l1ctl.c: drop redundant printf() call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11056 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: I02bc581afb5a76c51fdef50ed40e2669c3eb3f2e Gerrit-Change-Number: 11056 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Sep 2018 11: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 Sat Sep 22 11:35:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Sep 2018 11:35:37 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: drop redundant printf() call In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11056 ) Change subject: layer23/l1ctl.c: drop redundant printf() call ...................................................................... layer23/l1ctl.c: drop redundant printf() call Change-Id: I02bc581afb5a76c51fdef50ed40e2669c3eb3f2e --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 3c57042..78e340b 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -226,7 +226,6 @@ } if (dl->fire_crc >= 2) { -printf("Dropping frame with %u bit errors\n", dl->num_biterr); LOGP(DL1C, LOGL_NOTICE, "Dropping frame with %u bit errors\n", dl->num_biterr); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/11056 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: I02bc581afb5a76c51fdef50ed40e2669c3eb3f2e Gerrit-Change-Number: 11056 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 22 11:35:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Sep 2018 11:35:37 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: replace printf() calls by LOGP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11057 ) Change subject: layer23/l1ctl.c: replace printf() calls by LOGP ...................................................................... layer23/l1ctl.c: replace printf() calls by LOGP Change-Id: I863fb668500b2010dfef7a63217255fd010c06d7 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 78e340b..eedfb93 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -194,7 +194,7 @@ if (meas->dsc > meas->ds_fail) meas->dsc = meas->ds_fail; if (meas->dsc < meas->ds_fail) - printf("LOSS counter for CCCH %d\n", meas->dsc); + LOGP(DL1C, LOGL_INFO, "LOSS counter for CCCH %d\n", meas->dsc); if (meas->dsc > 0) break; meas->ds_fail = 0; @@ -216,7 +216,7 @@ if (meas->s > meas->rl_fail) meas->s = meas->rl_fail; if (meas->s < meas->rl_fail) - printf("LOSS counter for ACCH %d\n", meas->s); + LOGP(DL1C, LOGL_NOTICE, "LOSS counter for ACCH %d\n", meas->s); if (meas->s > 0) break; meas->rl_fail = 0; -- To view, visit https://gerrit.osmocom.org/11057 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: I863fb668500b2010dfef7a63217255fd010c06d7 Gerrit-Change-Number: 11057 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 22 11:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Sep 2018 11:35:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11055 ) Change subject: BSC_Tests: use consistant AMR S0-S15 bits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11055 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: I794e6d4fe8abc67337428cbe0bcc8802fae37a6e Gerrit-Change-Number: 11055 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Sep 2018 11: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 Sat Sep 22 11:36:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Sep 2018 11:36:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11055 ) Change subject: BSC_Tests: use consistant AMR S0-S15 bits ...................................................................... BSC_Tests: use consistant AMR S0-S15 bits At the moment we use the default S0-S15 bits for the AMR config, regardless what RSL_IE_Body mr_conf or osmo-bsc.cfg sets. - Make sure consistant S0-S15 bits are used for AMR related tests. Change-Id: I794e6d4fe8abc67337428cbe0bcc8802fae37a6e --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a99214b..9a43ead 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1905,6 +1905,10 @@ testcase TC_assignment_codec_amr_f() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* Note: This setups the codec configuration. The parameter payload in + * mr_conf must be consistant with the parameter codecElements in pars + * and also must match the amr-config in osmo-bsc.cfg! */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1912,11 +1916,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1924,6 +1931,8 @@ testcase TC_assignment_codec_amr_h() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* See note above */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1931,11 +1940,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/11055 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: I794e6d4fe8abc67337428cbe0bcc8802fae37a6e Gerrit-Change-Number: 11055 Gerrit-PatchSet: 1 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 Sat Sep 22 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 22 Sep 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_#254?= In-Reply-To: <623110857.205.1537542867406.JavaMail.jenkins@jenkins.osmocom.org> References: <623110857.205.1537542867406.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <117360363.216.1537629006514.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_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_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_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 -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 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 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.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_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 admin at opensuse.org Sat Sep 22 19:56:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:56:40 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5ba69e83edf40_3a78fa468c541657@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 134s] No package 'libpcsclite' found [ 134s] simtrace2-remsim.o: In function `main': [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 134s] apdu_dispatch.o: In function `apdu_segment_in': [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 134s] collect2: error: ld returned 1 exit status [ 134s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 134s] make[2]: *** [simtrace2-remsim] Error 1 [ 134s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 134s] Makefile:20: recipe for target 'utils' failed [ 134s] make[1]: *** [utils] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] dh_auto_build: make -j1 returned exit code 2 [ 134s] debian/rules:4: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:32 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 127.675212] sysrq: SysRq : Power Off [ 137s] [ 127.682567] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:35 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 19:56:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:56:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5ba69ea26b39d_3a78fa468c5417e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 131s] No package 'libpcsclite' found [ 131s] simtrace2-remsim.o: In function `main': [ 131s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 131s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 131s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 131s] apdu_dispatch.o: In function `apdu_segment_in': [ 131s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 131s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 131s] collect2: error: ld returned 1 exit status [ 131s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 131s] make[2]: *** [simtrace2-remsim] Error 1 [ 131s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 131s] Makefile:20: recipe for target 'utils' failed [ 131s] make[1]: *** [utils] Error 2 [ 131s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 131s] dh_auto_build: make -j1 returned exit code 2 [ 131s] debian/rules:4: recipe for target 'build' failed [ 131s] make: *** [build] Error 2 [ 131s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 131s] [ 131s] lamb24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:38 UTC 2018. [ 131s] [ 131s] ### VM INTERACTION START ### [ 134s] [ 122.146051] sysrq: SysRq : Power Off [ 134s] [ 122.153747] reboot: Power down [ 134s] ### VM INTERACTION END ### [ 134s] [ 134s] lamb24 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:42 UTC 2018. [ 134s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 19:56:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:56:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5ba69ea2b730e_3a78fa468c541879@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 137s] No package 'libpcsclite' found [ 137s] simtrace2-remsim.o: In function `main': [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 137s] apdu_dispatch.o: In function `apdu_segment_in': [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 137s] collect2: error: ld returned 1 exit status [ 137s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 137s] make[2]: *** [simtrace2-remsim] Error 1 [ 137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 137s] Makefile:20: recipe for target 'utils' failed [ 137s] make[1]: *** [utils] Error 2 [ 137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 137s] dh_auto_build: make -j1 returned exit code 2 [ 137s] debian/rules:4: recipe for target 'build' failed [ 137s] make: *** [build] Error 2 [ 137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 137s] [ 137s] lamb60 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:44 UTC 2018. [ 137s] [ 137s] ### VM INTERACTION START ### [ 140s] [ 130.507256] sysrq: SysRq : Power Off [ 140s] [ 130.514625] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb60 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:48 UTC 2018. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 19:57:14 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:57:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5ba69ea391b56_3a78fa468c5420ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 111s] No package 'libpcsclite' found [ 111s] simtrace2-remsim.o: In function `main': [ 111s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 111s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 111s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 111s] apdu_dispatch.o: In function `apdu_segment_in': [ 111s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 111s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 111s] collect2: error: ld returned 1 exit status [ 111s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 111s] make[2]: *** [simtrace2-remsim] Error 1 [ 111s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 111s] Makefile:20: recipe for target 'utils' failed [ 111s] make[1]: *** [utils] Error 2 [ 111s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 111s] dh_auto_build: make -j1 returned exit code 2 [ 111s] debian/rules:4: recipe for target 'build' failed [ 111s] make: *** [build] Error 2 [ 111s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 111s] [ 111s] sheep84 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:59 UTC 2018. [ 111s] [ 111s] ### VM INTERACTION START ### [ 115s] [ 108.146317] sysrq: SysRq : Power Off [ 115s] [ 108.152129] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] sheep84 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:57:03 UTC 2018. [ 115s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 19:56:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:56:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5ba69ea3223a7_3a78fa468c5419b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 141s] No package 'libpcsclite' found [ 141s] simtrace2-remsim.o: In function `main': [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 141s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 141s] apdu_dispatch.o: In function `apdu_segment_in': [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 141s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 141s] collect2: error: ld returned 1 exit status [ 141s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 141s] make[2]: *** [simtrace2-remsim] Error 1 [ 141s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 141s] Makefile:20: recipe for target 'utils' failed [ 141s] make[1]: *** [utils] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] dh_auto_build: make -j1 returned exit code 2 [ 141s] debian/rules:4: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 141s] [ 141s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:49 UTC 2018. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 132.530170] sysrq: SysRq : Power Off [ 144s] [ 132.537197] reboot: Power down [ 144s] ### VM INTERACTION END ### [ 144s] [ 144s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:56:52 UTC 2018. [ 144s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 19:57:49 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:57:49 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5ba69edb60324_3a78fa468c542112@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 164s] No package 'libpcsclite' found [ 164s] simtrace2-remsim.o: In function `main': [ 164s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 164s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 164s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 164s] apdu_dispatch.o: In function `apdu_segment_in': [ 164s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 164s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 164s] collect2: error: ld returned 1 exit status [ 164s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 164s] make[2]: *** [simtrace2-remsim] Error 1 [ 164s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 164s] Makefile:20: recipe for target 'utils' failed [ 164s] make[1]: *** [utils] Error 2 [ 164s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 164s] dh_auto_build: make -j1 returned exit code 2 [ 164s] debian/rules:4: recipe for target 'build' failed [ 164s] make: *** [build] Error 2 [ 164s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 164s] [ 164s] lamb60 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:57:35 UTC 2018. [ 164s] [ 164s] ### VM INTERACTION START ### [ 167s] [ 156.808414] sysrq: SysRq : Power Off [ 167s] [ 156.815547] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb60 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:57:38 UTC 2018. [ 167s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 19:57:49 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 19:57:49 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5ba69edb980be_3a78fa468c54229d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 156s] No package 'libpcsclite' found [ 156s] simtrace2-remsim.o: In function `main': [ 156s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 156s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 156s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 156s] apdu_dispatch.o: In function `apdu_segment_in': [ 156s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 156s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 156s] collect2: error: ld returned 1 exit status [ 156s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 156s] make[2]: *** [simtrace2-remsim] Error 1 [ 156s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 156s] Makefile:20: recipe for target 'utils' failed [ 156s] make[1]: *** [utils] Error 2 [ 156s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 156s] dh_auto_build: make -j1 returned exit code 2 [ 156s] debian/rules:4: recipe for target 'build' failed [ 156s] make: *** [build] Error 2 [ 156s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 156s] [ 156s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:57:42 UTC 2018. [ 156s] [ 156s] ### VM INTERACTION START ### [ 159s] [ 147.692480] sysrq: SysRq : Power Off [ 160s] [ 147.707748] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 19:57:46 UTC 2018. [ 160s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 20:01:31 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 20:01:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5ba69fb165c31_3a78fa468c542482@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 124s] No package 'libpcsclite' found [ 124s] simtrace2-remsim.o: In function `main': [ 124s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined reference to `osim_uicc_sim_cic_profile' [ 124s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 124s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 124s] apdu_dispatch.o: In function `apdu_segment_in': [ 124s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_uicc_sim_cic_profile' [ 124s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 124s] collect2: error: ld returned 1 exit status [ 124s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 124s] make[2]: *** [simtrace2-remsim] Error 1 [ 124s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 124s] Makefile:20: recipe for target 'utils' failed [ 124s] make[1]: *** [utils] Error 2 [ 124s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 124s] dh_auto_build: make -j1 returned exit code 2 [ 124s] debian/rules:4: recipe for target 'build' failed [ 124s] make: *** [build] Error 2 [ 124s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 124s] [ 124s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 20:01:15 UTC 2018. [ 124s] [ 124s] ### VM INTERACTION START ### [ 127s] [ 119.561839] sysrq: SysRq : Power Off [ 127s] [ 119.566387] reboot: Power down [ 127s] ### VM INTERACTION END ### [ 127s] [ 127s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 20:01:18 UTC 2018. [ 127s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 22 20:21:31 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 22 Sep 2018 20:21:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ba6a45dcff6e_3a78fa468c54518c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 293s] No package 'libpcsclite' found [ 293s] simtrace2-remsim.o: In function `main': [ 293s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined reference to `osim_reader_open' [ 293s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined reference to `osim_card_open' [ 293s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined reference to `osim_uicc_sim_cic_profile' [ 293s] apdu_dispatch.o: In function `apdu_segment_in': [ 293s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference to `osim_determine_apdu_case' [ 293s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference to `osim_uicc_sim_cic_profile' [ 293s] collect2: error: ld returned 1 exit status [ 293s] Makefile:9: recipe for target 'simtrace2-remsim' failed [ 293s] make[2]: *** [simtrace2-remsim] Error 1 [ 293s] make[2]: Leaving directory '/usr/src/packages/BUILD/host' [ 293s] Makefile:20: recipe for target 'utils' failed [ 293s] make[1]: *** [utils] Error 2 [ 293s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 293s] dh_auto_build: make -j1 returned exit code 2 [ 293s] debian/rules:4: recipe for target 'build' failed [ 293s] make: *** [build] Error 2 [ 293s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 293s] [ 293s] armbuild18 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 20:21:20 UTC 2018. [ 293s] [ 293s] ### VM INTERACTION START ### [ 296s] [ 262.160992] SysRq : Power Off [ 296s] [ 262.162523] reboot: Power down [ 296s] ### VM INTERACTION END ### [ 296s] [ 296s] armbuild18 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Sat Sep 22 20:21:23 UTC 2018. [ 296s] -- 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 Sep 23 11:20:14 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 11:20:14 +0000 Subject: Change in osmo-ci[master]: Add building for "mobile" and "virt_phy" as well In-Reply-To: References: Message-ID: Holger Freyther has abandoned this change. ( https://gerrit.osmocom.org/10973 ) Change subject: Add building for "mobile" and "virt_phy" as well ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7b2e6111f8b41219e9b2621be5720b9a738c69de Gerrit-Change-Number: 10973 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 13:38:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 23 Sep 2018 13:38:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: add MO/MT FORWARD_SM messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11062 Change subject: library/GSUP_Types.ttcn: add MO/MT FORWARD_SM messages ...................................................................... library/GSUP_Types.ttcn: add MO/MT FORWARD_SM messages According to 3GPP TS 29.002, sections 12.2 and 12.9 the FORWARD_SM messages (a.k.a MAP-*-FORWARD-SHORT-MESSAGE) are used to forward MO/MT SMS messages. Please note that only the 'must-have' fields of both message types are introduced by this change, in particular: - OSMO_GSUP_MSGT_{MO|MT}_FORWARD_SM_REQUEST (MAP Request) - OSMO_GSUP_SM_RP_DA_IE - OSMO_GSUP_SM_RP_OA_IE - OSMO_GSUP_SM_RP_UI_IE - OSMO_GSUP_MSGT_{MO|MT}_FORWARD_SM_RESULT (MAP ACK) - OSMO_GSUP_SM_RP_UI_IE - OSMO_GSUP_MSGT_{MO|MT}_FORWARD_SM_ERROR (MAP Response) - GSUP_CAUSE_IE (MAP User Error, see 7.6.1) Since there is no TCAP layer in GSUP, the context is emulated using the session management IEs, in particular using the GSUP_SESSION_ID_IE. The session state IE isn't used due to the 'REQ-RSP' nature of this message. Change-Id: Ibf49474a81235096c032ea21f217170f523bd94e --- M library/GSUP_Types.ttcn 1 file changed, 310 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/11062/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index fed13bf..a7c4732 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -48,7 +48,10 @@ /* SM related IEs (see 3GPP TS 29.002, section 7.6.8) */ OSMO_GSUP_SMSC_ADDR_IE ('40'O), OSMO_GSUP_NODE_ADDR_IE ('41'O), - OSMO_GSUP_SM_RP_RPI_IE ('42'O) + OSMO_GSUP_SM_RP_RPI_IE ('42'O), + OSMO_GSUP_SM_RP_DA_IE ('43'O), + OSMO_GSUP_SM_RP_OA_IE ('44'O), + OSMO_GSUP_SM_RP_UI_IE ('45'O) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_MessageType { @@ -85,7 +88,15 @@ /* FIXME: 0b001001? any ideas? */ OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST ('00100100'B), OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR ('00100101'B), - OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT ('00100110'B) + OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT ('00100110'B), + + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST ('00101000'B), + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR ('00101001'B), + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT ('00101010'B), + + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST ('00110000'B), + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR ('00110001'B), + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT ('00110010'B) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { @@ -141,6 +152,9 @@ smsc_addr, tag = OSMO_GSUP_SMSC_ADDR_IE; node_addr, tag = OSMO_GSUP_NODE_ADDR_IE; sm_rp_rpi, tag = OSMO_GSUP_SM_RP_RPI_IE; + sm_rp_da, tag = OSMO_GSUP_SM_RP_DA_IE; + sm_rp_oa, tag = OSMO_GSUP_SM_RP_OA_IE; + sm_rp_ui, tag = OSMO_GSUP_SM_RP_UI_IE; )" }; @@ -178,7 +192,10 @@ /* Short Message Service */ octetstring smsc_addr, /* FIXME: octetstring? */ octetstring node_addr, /* FIXME: octetstring? */ - boolean sm_rp_rpi /* FIXME: boolean? */ + boolean sm_rp_rpi, /* FIXME: boolean? */ + GSUP_SM_RP_DA sm_rp_da, + GSUP_SM_RP_OA sm_rp_oa, + octetstring sm_rp_ui }; type record GSUP_PDU { @@ -655,6 +672,140 @@ } } +/** + * SM-RP-DA represents the SM Destination Address, see 7.6.8.1. + * It can be either of the following: + * - IMSI + * - LMSI (not implemented) + * - MSISDN + * - roaming number (not implemented) + * - service centre address + */ +type union GSUP_SM_RP_DA_IeValue { + hexstring imsi, + hexstring msisdn, + octetstring smsc_addr +}; + +type record GSUP_SM_RP_DA { + GSUP_IEI tag, + GSUP_SM_RP_DA_IeValue val +} with { variant (val) "CROSSTAG(imsi, tag = OSMO_GSUP_IMSI_IE; + msisdn, tag = OSMO_GSUP_MSISDN_IE; + smsc_addr, tag = OSMO_GSUP_SMSC_ADDR_IE; + )" +}; + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_IMSI(hexstring imsi) := { + tag := OSMO_GSUP_IMSI_IE, + val := { imsi := imsi } +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_IMSI(template hexstring imsi) := { + tag := OSMO_GSUP_IMSI_IE, + val := { imsi := imsi } +} + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := { + tag := OSMO_GSUP_MSISDN_IE, + val := { msisdn := msisdn } +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := { + tag := OSMO_GSUP_MSISDN_IE, + val := { msisdn := msisdn } +} + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(octetstring smsc_addr) := { + tag := OSMO_GSUP_SMSC_ADDR_IE, + val := { smsc_addr := smsc_addr } +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template octetstring smsc_addr) := { + tag := OSMO_GSUP_SMSC_ADDR_IE, + val := { smsc_addr := smsc_addr } +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_DA(GSUP_SM_RP_DA val) := { + tag := OSMO_GSUP_SM_RP_DA_IE, + len := 0, /* overwritten */ + val := { + sm_rp_da := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_DA(template GSUP_SM_RP_DA val) := { + tag := OSMO_GSUP_SM_RP_DA_IE, + len := ?, + val := { + sm_rp_da := val + } +} + +/** + * SM-RP-OA represents the SM Originating Address, see 7.6.8.2. + * It can be either of the following: + * - MSISDN + * - service centre address + */ +type union GSUP_SM_RP_OA_IeValue { + hexstring msisdn, + octetstring smsc_addr +}; + +type record GSUP_SM_RP_OA { + GSUP_IEI tag, + GSUP_SM_RP_OA_IeValue val +} with { variant (val) "CROSSTAG(msisdn, tag = OSMO_GSUP_MSISDN_IE; + smsc_addr, tag = OSMO_GSUP_SMSC_ADDR_IE; + )" +}; + +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := { + tag := OSMO_GSUP_MSISDN_IE, + val := { msisdn := msisdn } +} +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := { + tag := OSMO_GSUP_MSISDN_IE, + val := { msisdn := msisdn } +} + +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(octetstring smsc_addr) := { + tag := OSMO_GSUP_SMSC_ADDR_IE, + val := { smsc_addr := smsc_addr } +} +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template octetstring smsc_addr) := { + tag := OSMO_GSUP_SMSC_ADDR_IE, + val := { smsc_addr := smsc_addr } +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_OA(GSUP_SM_RP_OA val) := { + tag := OSMO_GSUP_SM_RP_OA_IE, + len := 0, /* overwritten */ + val := { + sm_rp_oa := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_OA(template GSUP_SM_RP_OA val) := { + tag := OSMO_GSUP_SM_RP_OA_IE, + len := ?, + val := { + sm_rp_oa := val + } +} + +/* SM-RP-UI represents the SM TPDU, see 7.6.8.4 */ +template (value) GSUP_IE ts_GSUP_IE_SM_RP_UI(octetstring val) := { + tag := OSMO_GSUP_SM_RP_UI_IE, + len := 0, /* overwritten */ + val := { + sm_rp_ui := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_UI(template octetstring val) := { + tag := OSMO_GSUP_SM_RP_UI_IE, + len := ?, + val := { + sm_rp_ui := val + } +} + template (value) GSUP_IE ts_GSUP_IE_SSInfo(octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := 0, /* overwritten */ @@ -853,6 +1004,162 @@ } ); +template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_REQ( + OCT4 sid, /* TCAP TransactionID */ + GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, + { + /* TODO: optional IMSI */ + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), + valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) + } +); +template GSUP_PDU tr_GSUP_MO_FORWARD_SM_REQ( + template OCT4 sid := ?, /* TCAP TransactionID */ + template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, + { + /* TODO: optional IMSI */ + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_SM_RP_DA(sm_rp_da), + tr_GSUP_IE_SM_RP_OA(sm_rp_oa), + tr_GSUP_IE_SM_RP_UI(sm_rp_ui) + } +); + +template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_RES( + OCT4 sid, /* TCAP TransactionID */ + octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) + } +); +template GSUP_PDU tr_GSUP_MO_FORWARD_SM_RES( + template OCT4 sid := ?, /* TCAP TransactionID */ + template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_SM_RP_UI(sm_rp_ui) + } +); + +template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_ERR( + OCT4 sid, /* TCAP TransactionID */ + integer cause /* User error, see 12.2.3 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_Cause(cause)) + } +); +template GSUP_PDU tr_GSUP_MO_FORWARD_SM_ERR( + template OCT4 sid := ?, /* TCAP TransactionID */ + template integer cause := ? /* User error, see 12.2.3 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_Cause(cause) + } +); + +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_REQ( + OCT4 sid, /* TCAP TransactionID */ + GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST, + { + /** + * TODO: add MT-specific fields (and IEs): + * - moreMessagesToSend + * - smDeliveryTimer + * - smDeliveryStartTime + */ + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), + valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_REQ( + template OCT4 sid := ?, /* TCAP TransactionID */ + template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST, + { + /** + * TODO: add MT-specific fields (and IEs): + * - moreMessagesToSend + * - smDeliveryTimer + * - smDeliveryStartTime + */ + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_SM_RP_DA(sm_rp_da), + tr_GSUP_IE_SM_RP_OA(sm_rp_oa), + tr_GSUP_IE_SM_RP_UI(sm_rp_ui) + } +); + +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_RES( + OCT4 sid, /* TCAP TransactionID */ + octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_RES( + template OCT4 sid := ?, /* TCAP TransactionID */ + template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_SM_RP_UI(sm_rp_ui) + } +); + +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_ERR( + OCT4 sid, /* TCAP TransactionID */ + integer cause /* User error, see 12.9.3 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + { + valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_Cause(cause)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_ERR( + template OCT4 sid := ?, /* TCAP TransactionID */ + template integer cause := ? /* User error, see 12.9.3 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + { + tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_Cause(cause) + } +); + 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) { -- To view, visit https://gerrit.osmocom.org/11062 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: Ibf49474a81235096c032ea21f217170f523bd94e Gerrit-Change-Number: 11062 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 14:35:59 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 14:35:59 +0000 Subject: Change in osmo-gsm-tester[master]: Optimize and re-use an existing repository Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11063 Change subject: Optimize and re-use an existing repository ...................................................................... Optimize and re-use an existing repository Instead of cloning osmocom-bb three times this will allow us to re-use the repository. Simply change the directory, set the new origin and fetch. Change-Id: I63f103b2f70559e969e8c66477ab9ee7f2886832 --- M contrib/jenkins-build-common.sh 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/63/11063/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index c2ffbb4..f4198d0 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -75,10 +75,14 @@ fi cd "$base" - rm -rf "$repo" - git clone "$git_url/$repo" "$repo" + if [ -d "$repo" ]; then + cd "$repo" + git fetch + else + git clone "$git_url/$repo" "$repo" + cd "$repo" + fi - cd "$repo" # Figure out whether we need to prepend origin/ to find branches in upstream. # Doing this allows using git hashes instead of a branch name. @@ -86,7 +90,7 @@ branch="origin/$branch" fi - git checkout -b build_branch "$branch" + git checkout -B build_branch "$branch" rm -rf * git reset --hard "$branch" -- To view, visit https://gerrit.osmocom.org/11063 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: I63f103b2f70559e969e8c66477ab9ee7f2886832 Gerrit-Change-Number: 11063 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 14:36:00 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 14:36:00 +0000 Subject: Change in osmo-gsm-tester[master]: Package mobile and virtphy as part of osmocom-bb as well Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11064 Change subject: Package mobile and virtphy as part of osmocom-bb as well ...................................................................... Package mobile and virtphy as part of osmocom-bb as well Change-Id: Ie44dca72327e928073b00cde434d1cf2de574d9c --- M contrib/jenkins-build-osmocom-bb.sh 1 file changed, 4 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/64/11064/1 diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh index d5eec1e..e968a1a 100755 --- a/contrib/jenkins-build-osmocom-bb.sh +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -8,19 +8,9 @@ FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/" build_repo libosmocore --disable-doxygen - -have_repo osmocom-bb -cd osmocom-bb/ - -cd src/host/osmocon/ -set +x; echo; echo; set -x -autoreconf -fi -set +x; echo; echo; set -x -./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts -set +x; echo; echo; set -x -make -j4 -set +x; echo; echo; set -x -make install +build_repo_dir osmocom-bb src/host/virt_phy --enable-sanitize +build_repo_dir osmocom-bb src/host/osmocon --enable-sanitize +build_repo_dir osmocom-bb src/host/layer23 --enable-sanitize mkdir -p "$prefix" cd "$prefix" @@ -30,4 +20,4 @@ rpm2cpio osmocom-bb-firmware.rpm | cpio -idmv rm osmocom-bb-firmware.rpm -create_bin_tgz "" "osmocon" +create_bin_tgz "virtphy mobile" "osmocon" -- To view, visit https://gerrit.osmocom.org/11064 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: Ie44dca72327e928073b00cde434d1cf2de574d9c Gerrit-Change-Number: 11064 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 14:36:02 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 14:36:02 +0000 Subject: Change in osmo-gsm-tester[master]: Be able to switch-off ASAN builds of our binaries. Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11065 Change subject: Be able to switch-off ASAN builds of our binaries. ...................................................................... Be able to switch-off ASAN builds of our binaries. Inroduce a way to not take a 2x performance hit when testing. It is of importance if we run with hundreds of BTSes and 10k+ subscribers. In the absence of using getops or shflags use an environment for it. Change-Id: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-ggsn.sh M contrib/jenkins-build-osmo-hlr.sh M contrib/jenkins-build-osmo-iuh.sh M contrib/jenkins-build-osmo-mgw.sh M contrib/jenkins-build-osmo-msc.sh M contrib/jenkins-build-osmo-pcu.sh M contrib/jenkins-build-osmo-sgsn.sh M contrib/jenkins-build-osmo-stp.sh M contrib/jenkins-build-osmocom-bb.sh 12 files changed, 55 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/65/11065/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index f4198d0..f9b9193 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -49,6 +49,10 @@ # osmo-bts within the sysmoBTS SDK prefix_real="${prefix_real-"$prefix"}" +# Flag to be used to enable ASAN in builds. Defaults to enable ASAN builds and +# it can be disabled by passing SANITIZE_FLAGS="" to the build. +SANITIZE_FLAGS="${SANITIZE_FLAGS---enable-sanitize}" + export PKG_CONFIG_PATH="$prefix_real/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$prefix_real/lib:$LD_LIBRARY_PATH" diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh index 4081a00..5d4d333 100755 --- a/contrib/jenkins-build-osmo-bsc.sh +++ b/contrib/jenkins-build-osmo-bsc.sh @@ -4,11 +4,11 @@ name="osmo-bsc" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize -build_repo osmo-mgw --enable-sanitize -build_repo osmo-bsc --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo osmo-mgw ${SANITIZE_FLAGS} +build_repo osmo-bsc ${SANITIZE_FLAGS} create_bin_tgz "osmo-bsc abisip-find ipaccess-config" diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index e5fab5d..46a1c11 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -6,8 +6,8 @@ have_repo octphy-2g-headers -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo osmo-bts --enable-sanitize --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers create_bin_tgz "osmo-bts-trx osmo-bts-octphy" diff --git a/contrib/jenkins-build-osmo-ggsn.sh b/contrib/jenkins-build-osmo-ggsn.sh index a2cf952..fec2633 100755 --- a/contrib/jenkins-build-osmo-ggsn.sh +++ b/contrib/jenkins-build-osmo-ggsn.sh @@ -4,7 +4,7 @@ name="osmo-ggsn" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo osmo-ggsn --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo osmo-ggsn ${SANITIZE_FLAGS} create_bin_tgz osmo-ggsn diff --git a/contrib/jenkins-build-osmo-hlr.sh b/contrib/jenkins-build-osmo-hlr.sh index 3229e52..0b60955 100755 --- a/contrib/jenkins-build-osmo-hlr.sh +++ b/contrib/jenkins-build-osmo-hlr.sh @@ -4,8 +4,8 @@ name="osmo-hlr" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo osmo-hlr --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo osmo-hlr ${SANITIZE_FLAGS} create_bin_tgz osmo-hlr diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-iuh.sh index 03295f9..e8e7fa8 100755 --- a/contrib/jenkins-build-osmo-iuh.sh +++ b/contrib/jenkins-build-osmo-iuh.sh @@ -4,12 +4,12 @@ name="osmo-iuh" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize -build_repo libasn1c --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo libasn1c ${SANITIZE_FLAGS} -build_repo osmo-iuh --enable-sanitize +build_repo osmo-iuh ${SANITIZE_FLAGS} create_bin_tgz "osmo-hnbgw" diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index 5c1ce74..a04e0ca 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -4,9 +4,9 @@ name="osmo-mgw" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo osmo-mgw --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo osmo-mgw ${SANITIZE_FLAGS} create_bin_tgz "osmo-mgw" diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index b614052..c64f94d 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -4,15 +4,15 @@ name="osmo-msc" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -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 libasn1c --enable-sanitize -build_repo osmo-iuh --enable-sanitize -build_repo osmo-msc --enable-sanitize --enable-smpp --enable-iu +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libsmpp34 ${SANITIZE_FLAGS} +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo osmo-mgw ${SANITIZE_FLAGS} +build_repo osmo-hlr ${SANITIZE_FLAGS} +build_repo libasn1c ${SANITIZE_FLAGS} +build_repo osmo-iuh ${SANITIZE_FLAGS} +build_repo osmo-msc ${SANITIZE_FLAGS} --enable-smpp --enable-iu create_bin_tgz osmo-msc diff --git a/contrib/jenkins-build-osmo-pcu.sh b/contrib/jenkins-build-osmo-pcu.sh index 3d3fdd0..1877f9c 100755 --- a/contrib/jenkins-build-osmo-pcu.sh +++ b/contrib/jenkins-build-osmo-pcu.sh @@ -4,7 +4,7 @@ name="osmo-pcu" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-pcsc --disable-doxygen -build_repo osmo-pcu --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-pcsc --disable-doxygen +build_repo osmo-pcu ${SANITIZE_FLAGS} create_bin_tgz osmo-pcu diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index 87aed76..ffa787c 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -4,13 +4,13 @@ name="osmo-sgsn" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize -build_repo osmo-ggsn --enable-sanitize -build_repo libasn1c --enable-sanitize -build_repo osmo-iuh --enable-sanitize -build_repo osmo-sgsn --enable-sanitize --enable-iu +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo osmo-ggsn ${SANITIZE_FLAGS} +build_repo libasn1c ${SANITIZE_FLAGS} +build_repo osmo-iuh ${SANITIZE_FLAGS} +build_repo osmo-sgsn ${SANITIZE_FLAGS} --enable-iu create_bin_tgz osmo-sgsn diff --git a/contrib/jenkins-build-osmo-stp.sh b/contrib/jenkins-build-osmo-stp.sh index 985b090..5f9c421 100755 --- a/contrib/jenkins-build-osmo-stp.sh +++ b/contrib/jenkins-build-osmo-stp.sh @@ -4,9 +4,9 @@ name="osmo-stp" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} create_bin_tgz osmo-stp diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh index e968a1a..827fc94 100755 --- a/contrib/jenkins-build-osmocom-bb.sh +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -8,9 +8,9 @@ FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/" build_repo libosmocore --disable-doxygen -build_repo_dir osmocom-bb src/host/virt_phy --enable-sanitize -build_repo_dir osmocom-bb src/host/osmocon --enable-sanitize -build_repo_dir osmocom-bb src/host/layer23 --enable-sanitize +build_repo_dir osmocom-bb src/host/virt_phy ${SANITIZE_FLAGS} +build_repo_dir osmocom-bb src/host/osmocon ${SANITIZE_FLAGS} +build_repo_dir osmocom-bb src/host/layer23 ${SANITIZE_FLAGS} mkdir -p "$prefix" cd "$prefix" -- To view, visit https://gerrit.osmocom.org/11065 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: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c Gerrit-Change-Number: 11065 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 15:00:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Sep 2018 15:00:37 +0000 Subject: Change in simtrace2[master]: debian/control: Add dependency to libpcsclite-dev Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11066 Change subject: debian/control: Add dependency to libpcsclite-dev ...................................................................... debian/control: Add dependency to libpcsclite-dev The host utilities use libpcsclite, and the missing build dependency causes build failures in our nightly OBS builds since commit faf1e88e48c216456bdea6060a623b7c31f07c70 was merged: [ 131s] cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o -Wl,-z,relro `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` [ 131s] Package libpcsclite was not found in the pkg-config search path. [ 131s] Perhaps you should add the directory containing `libpcsclite.pc' [ 131s] to the PKG_CONFIG_PATH environment variable [ 131s] No package 'libpcsclite' found Change-Id: I29adfc629e5e4ffd0bf8b9035ef9138fe7693d96 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/66/11066/1 diff --git a/debian/control b/debian/control index 490ed85..f30b1d3 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Build-Depends: debhelper (>= 9), libosmocore-dev, + libpcsclite-dev, libnewlib-arm-none-eabi, libusb-1.0-0-dev, gcc-arm-none-eabi -- To view, visit https://gerrit.osmocom.org/11066 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: I29adfc629e5e4ffd0bf8b9035ef9138fe7693d96 Gerrit-Change-Number: 11066 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 23 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Sep 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_#255?= In-Reply-To: <117360363.216.1537629006514.JavaMail.jenkins@jenkins.osmocom.org> References: <117360363.216.1537629006514.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <300607348.229.1537715406755.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_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_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_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_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 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 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 -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_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 Sun Sep 23 15:15:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Sep 2018 15:15:08 +0000 Subject: Change in simtrace2[master]: debian/control: Add dependency to libpcsclite-dev In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11066 ) Change subject: debian/control: Add dependency to libpcsclite-dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11066 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: I29adfc629e5e4ffd0bf8b9035ef9138fe7693d96 Gerrit-Change-Number: 11066 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Sep 2018 15:15:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 15:15:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Sep 2018 15:15:13 +0000 Subject: Change in simtrace2[master]: debian/control: Add dependency to libpcsclite-dev In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11066 ) Change subject: debian/control: Add dependency to libpcsclite-dev ...................................................................... debian/control: Add dependency to libpcsclite-dev The host utilities use libpcsclite, and the missing build dependency causes build failures in our nightly OBS builds since commit faf1e88e48c216456bdea6060a623b7c31f07c70 was merged: [ 131s] cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o -Wl,-z,relro `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` [ 131s] Package libpcsclite was not found in the pkg-config search path. [ 131s] Perhaps you should add the directory containing `libpcsclite.pc' [ 131s] to the PKG_CONFIG_PATH environment variable [ 131s] No package 'libpcsclite' found Change-Id: I29adfc629e5e4ffd0bf8b9035ef9138fe7693d96 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 490ed85..f30b1d3 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Build-Depends: debhelper (>= 9), libosmocore-dev, + libpcsclite-dev, libnewlib-arm-none-eabi, libusb-1.0-0-dev, gcc-arm-none-eabi -- To view, visit https://gerrit.osmocom.org/11066 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: I29adfc629e5e4ffd0bf8b9035ef9138fe7693d96 Gerrit-Change-Number: 11066 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 Sep 23 16:53:22 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 16:53:22 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10686 to look at the new patch set (#3). 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, 137 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/10686/3 -- 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: newpatchset Gerrit-Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d Gerrit-Change-Number: 10686 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 16:53:22 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 16:53:22 +0000 Subject: Change in osmo-gsm-tester[master]: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10687 to look at the new patch set (#3). 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, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/10687/3 -- 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: newpatchset Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 17:17:23 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 17:17:23 +0000 Subject: Change in osmo-gsm-tester[master]: First round of clean-ups of imports and unused variables Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11067 Change subject: First round of clean-ups of imports and unused variables ...................................................................... First round of clean-ups of imports and unused variables Run pyflakes src/osmo_gsm_tester and then address the first round of problems. Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_nanobts.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/esme.py M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/report.py M src/osmo_gsm_tester/smsc.py M src/osmo_gsm_tester/suite.py 11 files changed, 11 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/11067/1 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 041b2bc..3c22fb6 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -17,12 +17,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os -import pprint -import tempfile import copy from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, schema, pcu_osmo +from . import log, config, schema class Bts(log.Origin, metaclass=ABCMeta): diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index a18f205..bec2433 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -18,11 +18,8 @@ # along with this program. If not, see . import os -import pprint -import tempfile import re -from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcap_recorder, bts, pcu +from . import log, config, util, process, pcap_recorder, bts, pcu from . import powersupply from .event_loop import MainLoop diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index f1a0ce8..a1dd494 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -19,8 +19,7 @@ import os import pprint -import tempfile -from . import log, config, util, template, process, pcu_osmo, bts_osmo +from . import log, config, util, template, process, bts_osmo class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit): diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 32784bd..361eb20 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -18,10 +18,9 @@ # along with this program. If not, see . import os -import pprint import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, bts, pcu_osmo +from . import log, bts, pcu_osmo class OsmoBts(bts.Bts, metaclass=ABCMeta): diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index e7e3542..910f4a1 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -19,9 +19,8 @@ import os import pprint -import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcu_osmo, bts_osmo +from . import log, config, util, template, process, bts_osmo from .event_loop import MainLoop class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit): diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py index 9653fbf..de3ac16 100644 --- a/src/osmo_gsm_tester/esme.py +++ b/src/osmo_gsm_tester/esme.py @@ -23,7 +23,7 @@ import smpplib.consts import smpplib.exceptions -from . import log, util, sms +from . import log from .event_loop import MainLoop # if you want to know what's happening inside python-smpplib diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index d0bbf23..21b208c 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -21,9 +21,6 @@ from .event_loop import MainLoop from pydbus import SystemBus, Variant -import time -import pprint -import sys # Required for Gio.Cancellable. # See https://lazka.github.io/pgi-docs/Gio-2.0/classes/Cancellable.html#Gio.Cancellable diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index ad8ebce..767264c 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -19,8 +19,7 @@ import os import pprint -import tempfile -from . import log, config, util, template, process, pcu +from . import config, util, template, process, pcu class OsmoPcu(pcu.Pcu): diff --git a/src/osmo_gsm_tester/report.py b/src/osmo_gsm_tester/report.py index a53504b..224cc46 100644 --- a/src/osmo_gsm_tester/report.py +++ b/src/osmo_gsm_tester/report.py @@ -17,11 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os import math from datetime import datetime import xml.etree.ElementTree as et -from . import log, suite, test +from . import test def trial_to_junit_write(trial, junit_path): elements = et.ElementTree(element=trial_to_junit(trial)) @@ -53,7 +52,7 @@ testcase.set('name', t.name()) testcase.set('time', str(math.ceil(t.duration))) if t.status == test.Test.SKIP: - skip = et.SubElement(testcase, 'skipped') + et.SubElement(testcase, 'skipped') elif t.status == test.Test.FAIL: failure = et.SubElement(testcase, 'failure') failure.set('type', t.fail_type or 'failure') diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py index 1a0859c..d154801 100644 --- a/src/osmo_gsm_tester/smsc.py +++ b/src/osmo_gsm_tester/smsc.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from . import log, config, util, template, process +from . import log, config class Smsc: diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 3a49574..932a6ab 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -21,7 +21,7 @@ import sys import time import pprint -from . import config, log, template, util, resource, schema, test +from . import config, log, util, resource, 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 -- To view, visit https://gerrit.osmocom.org/11067 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: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 Gerrit-Change-Number: 11067 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 17:25:31 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Sep 2018 17:25:31 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10686 ) Change subject: Create a "ms_driver" stub for the testsuite ...................................................................... Patch Set 2: (6 comments) I prefer not to spend the next weeks in trying to test/make the other event loop work for starting 20k processes in time but focus on getting to run a simple test running on Jenkins. 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. Done 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. [?] I think I followed the pattern. I am not sure how self._run_dir get's passed into it? What do you think of a mix-in to: * Create the directory (use the dir= option for the tempfile.mkdtem call) * Use shutil.rmtree to recursively delete its contents? 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. [?] Done 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. [?] As you point out this method behaves differently to the rest of the test and I think for the next few weeks/months we have to cope with it. The mass test is fundamentally different to running with a handful of subscribers. and python and the current architecture/code didn't scale well (at least on my laptop and I didn't retest since then). The immediate goal is: * Start BTS/NITB, configure subs to be used by mass test. The long-term goal is: * Be able to use the "ms_driver" as a drop-in replacement for a modem. At this point I don't think switching an event loop helps us to gain any immediate benefit and I would prefer not to do it. Let's get a mass test going first and then iterate on it. What do you think of finding a more compatible name? start_and_wait? start_blocking? 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)". Done 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: ip_address = self.ip_address() > You want to call self.register_for_cleanup(ms_driver) here. Done -- 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: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 23 Sep 2018 17:25:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 19:26:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 23 Sep 2018 19:26:36 +0000 Subject: Change in libosmocore[master]: GSUP/SM: (WIP) introduce new SRI_FOR_SM message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11068 Change subject: GSUP/SM: (WIP) introduce new SRI_FOR_SM message ...................................................................... GSUP/SM: (WIP) introduce new SRI_FOR_SM message According to 3GPP TS 29.002, section 12.1 the SRI_FOR_SM message (a.k.a MAP-SEND-ROUTING-INFO-FOR-SM) is used to retrieve the routing information needed for routing a short message to the servicing node of subscriber. Please note that only the 'must-have' fields of SRI_FOR_SM are introduced by this change, in particular: - GSUP_MSGT_SRI_FOR_SM_REQUEST (MAP Request) - GSUP_MSISDN_IE - GSUP_SM_RP_RPI_IE - GSUP_SMSC_ADDR_IE - GSUP_MSGT_SRI_FOR_SM_RESULT (MAP Response) - GSUP_IMSI_IE - GSUP_NODE_ADDR_IE - GSUP_MSGT_SRI_FOR_SM_ERROR (MAP Response) - GSUP_CAUSE_IE (MAP User Error, see 7.6.1) Since there is no TCAP layer in GSUP, the context is emulated using the session management IEs (see GSUP_SESSION_*_IE). Change-Id: I4303dc817a5f8ee97b78d840672c443a6eddb332 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c 2 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/11068/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 0ef5a75..bed61ae 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -88,6 +88,11 @@ /*! Supplementary Services payload */ OSMO_GSUP_SS_INFO_IE = 0x35, + + /* SM related IEs (see 3GPP TS 29.002, section 7.6.8) */ + OSMO_GSUP_SMSC_ADDR_IE = 0x40, + OSMO_GSUP_NODE_ADDR_IE = 0x41, + OSMO_GSUP_SM_RP_RPI_IE = 0x42, }; /*! GSUP message type */ @@ -121,6 +126,11 @@ OSMO_GSUP_MSGT_PROC_SS_REQUEST = 0b00100000, OSMO_GSUP_MSGT_PROC_SS_ERROR = 0b00100001, OSMO_GSUP_MSGT_PROC_SS_RESULT = 0b00100010, + + /* FIXME: 0b001001? any ideas? */ + OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST = 0b00100100, + OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR = 0b00100101, + OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT = 0b00100110, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -213,6 +223,14 @@ /*! ASN.1 encoded MAP payload for Supplementary Services */ uint8_t *ss_info; size_t ss_info_len; + + /*! SMS (Short Message Service) parameters */ + const uint8_t *smsc_addr; + size_t smsc_addr_len; + const uint8_t *node_addr; + size_t node_addr_len; + /*! HACK: SM-RP-RPI is (<0 / 0 / >0) => (false / omited / true) */ + int sm_rp_rpi; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 9c2f817..22e26f1 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -67,6 +67,10 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT), + { 0, NULL } }; @@ -434,6 +438,20 @@ gsup_msg->ss_info_len = value_len; break; + case OSMO_GSUP_SMSC_ADDR_IE: + gsup_msg->smsc_addr = value; + gsup_msg->smsc_addr_len = value_len; + break; + + case OSMO_GSUP_NODE_ADDR_IE: + gsup_msg->node_addr = value; + gsup_msg->node_addr_len = value_len; + break; + + case OSMO_GSUP_SM_RP_RPI_IE: + gsup_msg->sm_rp_rpi = (*value) ? 1 : -1; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -626,6 +644,21 @@ gsup_msg->ss_info_len, gsup_msg->ss_info); } + if (gsup_msg->smsc_addr) { + msgb_tlv_put(msg, OSMO_GSUP_SMSC_ADDR_IE, + gsup_msg->smsc_addr_len, gsup_msg->smsc_addr); + } + + if (gsup_msg->node_addr) { + msgb_tlv_put(msg, OSMO_GSUP_NODE_ADDR_IE, + gsup_msg->node_addr_len, gsup_msg->node_addr); + } + + if (gsup_msg->sm_rp_rpi != 0) { + u8 = gsup_msg->sm_rp_rpi > 0 ? 1 : 0; + msgb_tlv_put(msg, OSMO_GSUP_SM_RP_RPI_IE, sizeof(u8), &u8); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/11068 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: I4303dc817a5f8ee97b78d840672c443a6eddb332 Gerrit-Change-Number: 11068 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 23 19:26:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 23 Sep 2018 19:26:37 +0000 Subject: Change in libosmocore[master]: GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11069 Change subject: GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages ...................................................................... GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages According to 3GPP TS 29.002, sections 12.2 and 12.9 the FORWARD_SM messages (a.k.a MAP-*-FORWARD-SHORT-MESSAGE) are used to forward MO/MT SMS messages. Please note that only the 'must-have' fields of of both message types are introduced by this change, in particular: - OSMO_GSUP_MSGT_{MO|MT}_FORWARD_SM_REQUEST (MAP Request) - OSMO_GSUP_SM_RP_DA_IE - OSMO_GSUP_SM_RP_OA_IE - OSMO_GSUP_SM_RP_UI_IE - OSMO_GSUP_MSGT_{MO|MT}_FORWARD_SM_RESULT (MAP ACK) - OSMO_GSUP_SM_RP_UI_IE - OSMO_GSUP_MSGT_{MO|MT}_FORWARD_SM_ERROR (MAP Response) - GSUP_CAUSE_IE (MAP User Error, see 7.6.1) Since there is no TCAP layer in GSUP, the context is emulated using the session management IEs (see GSUP_SESSION_*_IE). Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.err 3 files changed, 96 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/11069/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index bed61ae..3f9a3f9 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -93,6 +93,9 @@ OSMO_GSUP_SMSC_ADDR_IE = 0x40, OSMO_GSUP_NODE_ADDR_IE = 0x41, OSMO_GSUP_SM_RP_RPI_IE = 0x42, + OSMO_GSUP_SM_RP_DA_IE = 0x43, + OSMO_GSUP_SM_RP_OA_IE = 0x44, + OSMO_GSUP_SM_RP_UI_IE = 0x45, }; /*! GSUP message type */ @@ -131,6 +134,14 @@ OSMO_GSUP_MSGT_SRI_FOR_SM_REQUEST = 0b00100100, OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR = 0b00100101, OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT = 0b00100110, + + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST = 0b00101000, + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR = 0b00101001, + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT = 0b00101010, + + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST = 0b00110000, + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR = 0b00110001, + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT = 0b00110010, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -231,6 +242,25 @@ size_t node_addr_len; /*! HACK: SM-RP-RPI is (<0 / 0 / >0) => (false / omited / true) */ int sm_rp_rpi; + + /*! SM Destination Address, see 7.6.8.1. It can be of the following: + ** IMSI, LMSI, MSISDN, roaming number, or service centre address. + ** The values from 'osmo_gsup_iei' enum are used for 'sm_rp_da_type'. + ** NOTE: LMSI, roaming number are not implemented */ + const uint8_t *sm_rp_da; + uint8_t sm_rp_da_type; + size_t sm_rp_da_len; + + /*! SM Originating Address, see 7.6.8.2. It can be of the following: + ** MSISDN or service centre address. ** The values from 'osmo_gsup_iei' + ** enum are used for 'sm_rp_da_type'. */ + const uint8_t *sm_rp_oa; + uint8_t sm_rp_oa_type; + size_t sm_rp_oa_len; + + /*! SM TPDU (Transport Protocol Data Unit), see 7.6.8.4 */ + const uint8_t *sm_rp_ui; + size_t sm_rp_ui_len; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 22e26f1..752cfca 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -71,6 +71,14 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_SRI_FOR_SM_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_SRI_FOR_SM_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT), + + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT), + { 0, NULL } }; @@ -452,6 +460,37 @@ gsup_msg->sm_rp_rpi = (*value) ? 1 : -1; break; + case OSMO_GSUP_SM_RP_DA_IE: + /* First octet contains type of address */ + if (value_len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "Short read of " + "SM_RP_DA_IE (missing address type)\n"); + return -GMM_CAUSE_COND_IE_ERR; + } + + gsup_msg->sm_rp_da = value + 1; /* Skip address type */ + gsup_msg->sm_rp_da_len = value_len - 1; + gsup_msg->sm_rp_da_type = value[0]; + break; + + case OSMO_GSUP_SM_RP_OA_IE: + /* First octet contains type of address */ + if (value_len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "Short read of " + "SM_RP_OA_IE (missing address type)\n"); + return -GMM_CAUSE_COND_IE_ERR; + } + + gsup_msg->sm_rp_oa = value + 1; /* Skip address type */ + gsup_msg->sm_rp_oa_len = value_len - 1; + gsup_msg->sm_rp_oa_type = value[0]; + break; + + case OSMO_GSUP_SM_RP_UI_IE: + gsup_msg->sm_rp_ui = value; + gsup_msg->sm_rp_ui_len = value_len; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -659,6 +698,31 @@ msgb_tlv_put(msg, OSMO_GSUP_SM_RP_RPI_IE, sizeof(u8), &u8); } + if (gsup_msg->sm_rp_da) { + /* Compose TLTV manually */ + uint8_t *buf = msgb_put(msg, TLV_GROSS_LEN(gsup_msg->sm_rp_da_len + 1)); + *buf++ = OSMO_GSUP_SM_RP_DA_IE; + *buf++ = gsup_msg->sm_rp_da_len + 1; + *buf++ = gsup_msg->sm_rp_da_type; + if (gsup_msg->sm_rp_da_len) + memcpy(buf, gsup_msg->sm_rp_da, gsup_msg->sm_rp_da_len); + } + + if (gsup_msg->sm_rp_oa) { + /* Compose TLTV manually */ + uint8_t *buf = msgb_put(msg, TLV_GROSS_LEN(gsup_msg->sm_rp_oa_len + 1)); + *buf++ = OSMO_GSUP_SM_RP_OA_IE; + *buf++ = gsup_msg->sm_rp_oa_len + 1; + *buf++ = gsup_msg->sm_rp_oa_type; + if (gsup_msg->sm_rp_oa_len) + memcpy(buf, gsup_msg->sm_rp_oa, gsup_msg->sm_rp_oa_len); + } + + if (gsup_msg->sm_rp_ui) { + msgb_tlv_put(msg, OSMO_GSUP_SM_RP_UI_IE, + gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui); + } + return 0; } diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index ac71ac2..389a721 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -72,13 +72,13 @@ message 2: tested 21248 modifications, 2571 parse failures message 3: tested 2816 modifications, 510 parse failures message 4: tested 3584 modifications, 768 parse failures - message 5: tested 20736 modifications, 4010 parse failures + message 5: tested 20736 modifications, 4012 parse failures message 6: tested 3584 modifications, 769 parse failures message 7: tested 3584 modifications, 768 parse failures message 8: tested 2816 modifications, 510 parse failures message 9: tested 2816 modifications, 510 parse failures message 10: tested 3584 modifications, 768 parse failures - message 11: tested 3328 modifications, 767 parse failures + message 11: tested 3328 modifications, 769 parse failures message 12: tested 54016 modifications, 4622 parse failures message 13: tested 11520 modifications, 1026 parse failures message 14: tested 5120 modifications, 1026 parse failures -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 00:10:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 00:10:45 +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_#2082?= Message-ID: <91868232.232.1537747845893.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 714.59 KB...] 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 CC RANAP_SupportedBitrate.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_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_SuccessfulOutcome.lo CC RANAP_UnsuccessfulOutcome.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 CC RANAP_RelocationRequestAcknowledge.lo CC RANAP_RelocationFailure.lo CC RANAP_RelocationCancel.lo CC RANAP_RelocationCancelAcknowledge.lo CC RANAP_SRNS-ContextRequest.lo CC RANAP_RAB-DataForwardingList-SRNS-CtxReq.lo CC RANAP_DataVolumeReportRequest.lo CC RANAP_SRNS-ContextResponse.lo CC RANAP_SecurityModeCommand.lo CC RANAP_SecurityModeComplete.lo CC RANAP_SecurityModeReject.lo CC RANAP_DataVolumeReport.lo CC RANAP_Reset.lo CC RANAP_ResetAcknowledge.lo CC RANAP_RAB-ReleaseRequest.lo CC RANAP_RedirectionIndication.lo CC RANAP_RAB-ReleaseList.lo CC RANAP_Iu-ReleaseRequest.lo CC RANAP_RelocationDetect.lo CC RANAP_RelocationComplete.lo CC RANAP_Paging.lo CC RANAP_CommonID.lo CC RANAP_CN-InvokeTrace.lo CC RANAP_CN-DeactivateTrace.lo CC RANAP_LocationReportingControl.lo CC RANAP_LocationReport.lo CC RANAP_InitialUE-Message.lo CC RANAP_DirectTransfer.lo CC RANAP_Overload.lo CC RANAP_ErrorIndication.lo CC RANAP_SRNS-DataForwardCommand.lo CC RANAP_ForwardSRNS-Context.lo CC RANAP_RAB-AssignmentRequest.lo CC RANAP_RAB-SetupOrModifyList.lo CC RANAP_RAB-AssignmentResponse.lo CC RANAP_PrivateMessage.lo CC RANAP_ResetResource.lo CC RANAP_ResetResourceAcknowledge.lo CC RANAP_RANAP-RelocationInformation.lo CC RANAP_RAB-ModifyRequest.lo CC RANAP_LocationRelatedDataRequest.lo CC RANAP_LocationRelatedDataResponse.lo CC RANAP_LocationRelatedDataFailure.lo CC RANAP_InformationTransferIndication.lo CC RANAP_InformationTransferConfirmation.lo CC RANAP_InformationTransferFailure.lo CC RANAP_UESpecificInformationIndication.lo CC RANAP_DirectInformationTransfer.lo CC RANAP_UplinkInformationExchangeRequest.lo CC RANAP_UplinkInformationExchangeResponse.lo CC RANAP_UplinkInformationExchangeFailure.lo CC RANAP_MBMSSessionStart.lo CC RANAP_MBMSSessionStartResponse.lo CC RANAP_MBMSSessionStartFailure.lo CC RANAP_MBMSSessionUpdate.lo CC RANAP_MBMSSessionUpdateResponse.lo CC RANAP_MBMSSessionUpdateFailure.lo CC RANAP_MBMSSessionStop.lo CC RANAP_MBMSSessionStopResponse.lo CC RANAP_MBMSUELinkingRequest.lo CC RANAP_MBMSUELinkingResponse.lo CC RANAP_MBMSRegistrationRequest.lo CC RANAP_MBMSRegistrationResponse.lo CC RANAP_MBMSRegistrationFailure.lo CC RANAP_MBMSCNDe-RegistrationRequest.lo CC RANAP_MBMSCNDe-RegistrationResponse.lo CC RANAP_MBMSRABEstablishmentIndication.lo CC RANAP_MBMSRABReleaseRequest.lo CC RANAP_MBMSRABRelease.lo CC RANAP_MBMSRABReleaseFailure.lo CC RANAP_EnhancedRelocationCompleteRequest.lo CC RANAP_EnhancedRelocationCompleteResponse.lo CC RANAP_EnhancedRelocationCompleteFailure.lo CC RANAP_EnhancedRelocationCompleteConfirm.lo CC RANAP_RANAP-EnhancedRelocationInformationRequest.lo CC RANAP_RANAP-EnhancedRelocationInformationResponse.lo CC RANAP_SRVCC-CSKeysRequest.lo CC RANAP_SRVCC-CSKeysResponse.lo CC RANAP_UeRadioCapabilityMatchRequest.lo CC RANAP_UeRadioCapabilityMatchResponse.lo CC RANAP_ProtocolExtensionContainer.lo CC RANAP_ProtocolExtensionField.lo CC RANAP_IE.lo CC RANAP_ProtocolIE-Container.lo CC RANAP_ProtocolIE-FieldPair.lo CC RANAP_ProtocolIE-ContainerPair.lo CC RANAP_RAB-IE-ContainerList.lo CC RANAP_RAB-IE-ContainerPairList.lo CC RANAP_ProtocolError-IE-ContainerList.lo CC RANAP_IuSigConId-IE-ContainerList.lo CC RANAP_DirectTransfer-IE-ContainerList.lo CC RANAP_DataVolumeReportList.lo CC RANAP_RAB-ReleasedList-IuRelComp.lo CC RANAP_RAB-RelocationReleaseList.lo CC RANAP_RAB-DataForwardingList.lo CC RANAP_RAB-SetupList-RelocReq.lo CC RANAP_RAB-SetupList-RelocReqAck.lo CC RANAP_RAB-FailedList.lo CC RANAP_RAB-ContextList.lo CC RANAP_RABs-ContextFailedtoTransferList.lo CC RANAP_RAB-DataVolumeReportRequestList.lo CC RANAP_RAB-DataVolumeReportRequestItem.lo CC RANAP_RABs-failed-to-reportList.lo CC RANAP_RAB-SetupList-EnhancedRelocCompleteReq.lo CC RANAP_RAB-SetupList-EnhancedRelocCompleteRes.lo CC RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.lo CC RANAP_RAB-SetupOrModifiedList.lo CC RANAP_RAB-ReleasedList.lo CC RANAP_RAB-QueuedList.lo CC RANAP_RAB-ContextList-RANAP-RelocInf.lo CC RANAP_RAB-SetupList-EnhRelocInfoReq.lo CC RANAP_RAB-FailedList-EnhRelocInfoRes.lo CC RANAP_RAB-SetupList-EnhRelocInfoRes.lo CC RANAP_RAB-ModifyList.lo CC RANAP_RAB-DataVolumeReportList.lo /bin/bash: line 1: 17189 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.7-37c1\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.7-37c1\" -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.7-37c1\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_RAB-SetupList-EnhRelocInfoRes.lo -MD -MP -MF .deps/RANAP_RAB-SetupList-EnhRelocInfoRes.Tpo -c -o RANAP_RAB-SetupList-EnhRelocInfoRes.lo RANAP_RAB-SetupList-EnhRelocInfoRes.c Makefile:2506: recipe for target 'RANAP_RAB-SetupList-EnhRelocInfoRes.lo' failed make[4]: *** [RANAP_RAB-SetupList-EnhRelocInfoRes.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: 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 Mon Sep 24 00:59:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 00:59:34 +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_#2083?= In-Reply-To: <91868232.232.1537747845893.JavaMail.jenkins@jenkins.osmocom.org> References: <91868232.232.1537747845893.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <307413912.233.1537750774821.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Sep 24 02:21:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 02:21:43 +0000 Subject: Change in libosmocore[master]: vty reference: fix deprecation bit evaluation Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11070 Change subject: vty reference: fix deprecation bit evaluation ...................................................................... vty reference: fix deprecation bit evaluation In vty_dump_nodes(), make sure the bitwise & is evaluated first. For the deprecation flag (0x1), the practical effect is most likely identical, assuming that the boolean ! operator flips the first bit, so I expect no visible functional difference. It still was confusing and wrong to look at. Related: OS#3584 Change-Id: I1f18e0e41da4772d092d71261b9e489dc1598923 --- M src/vty/command.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/11070/1 diff --git a/src/vty/command.c b/src/vty/command.c index 43f974c..900680f 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -679,7 +679,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (!vty_command_is_common(elem)) continue; - if (!elem->attr & CMD_ATTR_DEPRECATED) + if (!(elem->attr & CMD_ATTR_DEPRECATED)) vty_dump_element(elem, vty); } } @@ -717,7 +717,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (vty_command_is_common(elem)) continue; - if (!elem->attr & CMD_ATTR_DEPRECATED) + if (!(elem->attr & CMD_ATTR_DEPRECATED)) vty_dump_element(elem, vty); } -- To view, visit https://gerrit.osmocom.org/11070 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: I1f18e0e41da4772d092d71261b9e489dc1598923 Gerrit-Change-Number: 11070 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 02:21:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 02:21:44 +0000 Subject: Change in libosmocore[master]: vty list: fix deprecation/hidden bit logic Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11071 Change subject: vty list: fix deprecation/hidden bit logic ...................................................................... vty list: fix deprecation/hidden bit logic If a command is both hidden and deprecated, still don't show it for the 'list' command. We currently have no such nodes, as it seems, though. Related: OS#3584 Change-Id: I07ec15cab057a3e09064e0420a69121ee8eb4253 --- M src/vty/command.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/11071/1 diff --git a/src/vty/command.c b/src/vty/command.c index 900680f..1e77d13 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -2728,8 +2728,7 @@ for (i = 0; i < vector_active(cnode->cmd_vector); i++) if ((cmd = vector_slot(cnode->cmd_vector, i)) != NULL - && !(cmd->attr == CMD_ATTR_DEPRECATED - || cmd->attr == CMD_ATTR_HIDDEN)) + && !(cmd->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))) vty_out(vty, " %s%s", cmd->string, VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/11071 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: I07ec15cab057a3e09064e0420a69121ee8eb4253 Gerrit-Change-Number: 11071 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 05:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Sep 2018 05:45:49 +0000 Subject: Change in libosmocore[master]: vty reference: fix deprecation bit evaluation In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11070 ) Change subject: vty reference: fix deprecation bit evaluation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11070 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: I1f18e0e41da4772d092d71261b9e489dc1598923 Gerrit-Change-Number: 11070 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 24 Sep 2018 05:45: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 Sep 24 05:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Sep 2018 05:46:39 +0000 Subject: Change in libosmocore[master]: vty list: fix deprecation/hidden bit logic In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11071 ) Change subject: vty list: fix deprecation/hidden bit logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11071 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: I07ec15cab057a3e09064e0420a69121ee8eb4253 Gerrit-Change-Number: 11071 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 24 Sep 2018 05:46: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 Sep 24 06:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Sep 2018 06:02:28 +0000 Subject: Change in libosmocore[master]: vty/command.h: document and prettify CMD_ATTR_* flags Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11072 Change subject: vty/command.h: document and prettify CMD_ATTR_* flags ...................................................................... vty/command.h: document and prettify CMD_ATTR_* flags Since the CMD_ATTR_* flags are intended to be used in bitwise operations, let's assign them proper values. Adding a new flag (e.g. CMD_ATTR_FOO_BAR) could actually result in assigning 0x03 instead of expected (0x01 << 2). Change-Id: I3b1badef830f7e6436a67673b5709ec33c060c68 Related: OS#3584 --- M include/osmocom/vty/command.h 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/11072/1 diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 13d6e89..d63dbde 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -132,9 +132,10 @@ char name[64]; }; +/*! Attributes (flags) for \ref cmd_element */ enum { - CMD_ATTR_DEPRECATED = 1, - CMD_ATTR_HIDDEN, + CMD_ATTR_DEPRECATED = (1 << 0), + CMD_ATTR_HIDDEN = (1 << 1), }; /*! Structure of a command element */ -- To view, visit https://gerrit.osmocom.org/11072 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: I3b1badef830f7e6436a67673b5709ec33c060c68 Gerrit-Change-Number: 11072 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 06:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 06:38:58 +0000 Subject: Change in libosmocore[master]: vty/command.h: document and prettify CMD_ATTR_* flags In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11072 ) Change subject: vty/command.h: document and prettify CMD_ATTR_* flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11072 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: I3b1badef830f7e6436a67673b5709ec33c060c68 Gerrit-Change-Number: 11072 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 24 Sep 2018 06:38:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 06:39:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 06:39:23 +0000 Subject: Change in libosmocore[master]: vty reference: fix deprecation bit evaluation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11070 ) Change subject: vty reference: fix deprecation bit evaluation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11070 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: I1f18e0e41da4772d092d71261b9e489dc1598923 Gerrit-Change-Number: 11070 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 24 Sep 2018 06:39: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 Sep 24 06:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 06:39:50 +0000 Subject: Change in libosmocore[master]: vty list: fix deprecation/hidden bit logic In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11071 ) Change subject: vty list: fix deprecation/hidden bit logic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11071 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: I07ec15cab057a3e09064e0420a69121ee8eb4253 Gerrit-Change-Number: 11071 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 24 Sep 2018 06:39: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 Sep 24 06:39:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 06:39:59 +0000 Subject: Change in libosmocore[master]: vty/command.h: document and prettify CMD_ATTR_* flags In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11072 ) Change subject: vty/command.h: document and prettify CMD_ATTR_* flags ...................................................................... vty/command.h: document and prettify CMD_ATTR_* flags Since the CMD_ATTR_* flags are intended to be used in bitwise operations, let's assign them proper values. Adding a new flag (e.g. CMD_ATTR_FOO_BAR) could actually result in assigning 0x03 instead of expected (0x01 << 2). Change-Id: I3b1badef830f7e6436a67673b5709ec33c060c68 Related: OS#3584 --- M include/osmocom/vty/command.h 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 13d6e89..d63dbde 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -132,9 +132,10 @@ char name[64]; }; +/*! Attributes (flags) for \ref cmd_element */ enum { - CMD_ATTR_DEPRECATED = 1, - CMD_ATTR_HIDDEN, + CMD_ATTR_DEPRECATED = (1 << 0), + CMD_ATTR_HIDDEN = (1 << 1), }; /*! Structure of a command element */ -- To view, visit https://gerrit.osmocom.org/11072 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: I3b1badef830f7e6436a67673b5709ec33c060c68 Gerrit-Change-Number: 11072 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 24 06:40:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 06:40:05 +0000 Subject: Change in libosmocore[master]: vty reference: fix deprecation bit evaluation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11070 ) Change subject: vty reference: fix deprecation bit evaluation ...................................................................... vty reference: fix deprecation bit evaluation In vty_dump_nodes(), make sure the bitwise & is evaluated first. For the deprecation flag (0x1), the practical effect is most likely identical, assuming that the boolean ! operator flips the first bit, so I expect no visible functional difference. It still was confusing and wrong to look at. Related: OS#3584 Change-Id: I1f18e0e41da4772d092d71261b9e489dc1598923 --- M src/vty/command.c 1 file changed, 2 insertions(+), 2 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/command.c b/src/vty/command.c index 43f974c..900680f 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -679,7 +679,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (!vty_command_is_common(elem)) continue; - if (!elem->attr & CMD_ATTR_DEPRECATED) + if (!(elem->attr & CMD_ATTR_DEPRECATED)) vty_dump_element(elem, vty); } } @@ -717,7 +717,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (vty_command_is_common(elem)) continue; - if (!elem->attr & CMD_ATTR_DEPRECATED) + if (!(elem->attr & CMD_ATTR_DEPRECATED)) vty_dump_element(elem, vty); } -- To view, visit https://gerrit.osmocom.org/11070 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: I1f18e0e41da4772d092d71261b9e489dc1598923 Gerrit-Change-Number: 11070 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr 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 Mon Sep 24 06:40:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 06:40:05 +0000 Subject: Change in libosmocore[master]: vty list: fix deprecation/hidden bit logic In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11071 ) Change subject: vty list: fix deprecation/hidden bit logic ...................................................................... vty list: fix deprecation/hidden bit logic If a command is both hidden and deprecated, still don't show it for the 'list' command. We currently have no such nodes, as it seems, though. Related: OS#3584 Change-Id: I07ec15cab057a3e09064e0420a69121ee8eb4253 --- M src/vty/command.c 1 file changed, 1 insertion(+), 2 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/command.c b/src/vty/command.c index 900680f..1e77d13 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -2728,8 +2728,7 @@ for (i = 0; i < vector_active(cnode->cmd_vector); i++) if ((cmd = vector_slot(cnode->cmd_vector, i)) != NULL - && !(cmd->attr == CMD_ATTR_DEPRECATED - || cmd->attr == CMD_ATTR_HIDDEN)) + && !(cmd->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))) vty_out(vty, " %s%s", cmd->string, VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/11071 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: I07ec15cab057a3e09064e0420a69121ee8eb4253 Gerrit-Change-Number: 11071 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 06:53:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 06:53:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5743?= Message-ID: <1085449347.241.1537772016642.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 230.62 KB...] > 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 > ps xua | grep osmo build 25191 1.1 0.0 39748 14840 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25232 0.0 0.0 21474958428 11508 ? S 06:53 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfglw1bmj build 25239 0.0 0.0 4336 768 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25241 0.0 0.0 11128 1000 ? S 06:53 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfglw1bmj, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfglw1bmj' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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 > ps xua | grep osmo build 25191 0.8 0.0 39748 14840 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25242 0.0 0.0 21474958428 11548 ? S 06:53 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfglw1bmj build 25249 0.0 0.0 4336 760 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25251 0.0 0.0 11128 964 ? R 06:53 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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 > ps xua | grep osmo build 25191 0.8 0.0 39748 14840 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25252 0.0 0.0 21475030184 21276 ? R 06:53 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25259 0.0 0.0 4336 728 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25261 0.0 0.0 11128 956 ? S 06:53 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgX7Mg7Q, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgX7Mg7Q' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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 > ps xua | grep osmo build 25191 0.7 0.0 39908 14968 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25262 0.0 0.0 21475030184 13152 ? R 06:53 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgX7Mg7Q build 25269 0.0 0.0 4336 744 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25271 0.0 0.0 11128 952 ? S 06:53 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgX7Mg7Q, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgX7Mg7Q' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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 > ps xua | grep osmo build 25191 0.7 0.0 39908 14968 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25272 0.0 0.0 21475030184 13532 ? R 06:53 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgX7Mg7Q build 25279 0.0 0.0 4336 760 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25281 0.0 0.0 11128 976 ? S 06:53 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25191 0.6 0.0 39908 14968 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25282 0.0 0.0 21474956172 10684 ? S 06:53 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25289 0.0 0.0 4336 760 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25291 0.0 0.0 11128 960 ? S 06:53 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgNYnEqy, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgNYnEqy' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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 > ps xua | grep osmo build 25191 0.6 0.0 39908 14968 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25292 0.0 0.0 21474956176 10724 ? D 06:53 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgNYnEqy build 25299 0.0 0.0 4336 804 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25301 0.0 0.0 11128 1044 ? S 06:53 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgNYnEqy, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgNYnEqy' > ls -l /proc/25191/fd total 0 lr-x------ 1 build build 64 Sep 24 06:53 0 -> pipe:[1429828319] l-wx------ 1 build build 64 Sep 24 06:53 1 -> pipe:[1429828320] lr-x------ 1 build build 64 Sep 24 06:53 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:53 2 -> pipe:[1429828321] l-wx------ 1 build build 64 Sep 24 06:53 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25191 0.5 0.0 39908 14968 ? S 06:53 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25302 0.0 0.0 21474956172 10780 ? S 06:53 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgNYnEqy build 25309 0.0 0.0 4336 764 ? S 06:53 0:00 /bin/sh -c ps xua | grep osmo build 25311 0.0 0.0 11128 956 ? S 06:53 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 06:54:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 06:54:42 +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_#5743?= Message-ID: <606423882.242.1537772082146.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.01 MB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 2730 1.1 0.0 39744 14836 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2771 0.0 0.0 21474958428 11200 ? S 06:54 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgpRmHSx build 2778 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2780 0.0 0.0 11128 1028 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgpRmHSx, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgpRmHSx' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 2730 0.8 0.0 39744 14836 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2781 0.0 0.0 21474958428 11304 ? S 06:54 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgpRmHSx build 2788 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2790 0.0 0.0 4336 100 ? R 06:54 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 2730 0.9 0.0 39744 14836 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2791 0.0 0.0 21475042604 21304 ? R 06:54 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2798 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2800 0.0 0.0 11128 1028 ? S 06:54 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgiGT8CN, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgiGT8CN' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 2730 0.9 0.0 39648 14828 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2801 0.0 0.0 21475042604 14968 ? R 06:54 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgiGT8CN build 2808 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2810 0.0 0.0 4336 100 ? R 06:54 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgiGT8CN, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgiGT8CN' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 2730 0.7 0.0 39648 14828 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2811 0.0 0.0 21474976440 13824 ? R 06:54 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgiGT8CN build 2818 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2820 0.0 0.0 11128 1028 ? S 06:54 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2730 0.6 0.0 39648 14828 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2821 0.0 0.0 21474962632 10992 ? S 06:54 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2828 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2830 0.0 0.0 11128 1028 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgocXWBP, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgocXWBP' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 2730 0.6 0.0 39800 14856 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2831 0.0 0.0 21474962632 10984 ? S 06:54 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgocXWBP build 2838 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2840 0.0 0.0 11128 1028 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgocXWBP, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgocXWBP' > ls -l /proc/2730/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[881304992] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[881304993] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[881304994] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 2730 0.6 0.0 39800 14856 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2841 0.0 0.0 21474962632 11024 ? S 06:54 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgocXWBP build 2848 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 2850 0.0 0.0 11128 1028 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) ERRORS: 1 make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 06:54:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 06:54:53 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5744?= In-Reply-To: <1085449347.241.1537772016642.JavaMail.jenkins@jenkins.osmocom.org> References: <1085449347.241.1537772016642.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <198391203.243.1537772093615.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 231.46 KB...] > 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 > ps xua | grep osmo build 25371 0.6 0.0 39744 14804 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25412 0.0 0.0 21474958428 11400 ? S 06:54 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgEx9WCU build 25419 0.0 0.0 4336 764 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25421 0.0 0.0 11128 1000 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgEx9WCU, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgEx9WCU' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 25371 0.5 0.0 39744 14804 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25422 0.0 0.0 21474958428 11352 ? S 06:54 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgEx9WCU build 25429 0.0 0.0 4336 768 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25431 0.0 0.0 11128 992 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 25371 0.4 0.0 39744 14804 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25432 0.0 0.0 21474964024 12624 ? R 06:54 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25439 0.0 0.0 4336 728 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25441 0.0 0.0 11128 1000 ? S 06:54 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgO6uQgW, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgO6uQgW' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 25371 0.4 0.0 39648 14796 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25442 0.0 0.0 21474964020 12964 ? R 06:54 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgO6uQgW build 25449 0.0 0.0 4336 808 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25451 0.0 0.0 11128 928 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgO6uQgW, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgO6uQgW' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 25371 0.4 0.0 39648 14796 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25452 0.0 0.0 21475030184 17172 ? R 06:54 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgO6uQgW build 25459 0.0 0.0 4336 732 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25461 0.0 0.0 11128 992 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25371 0.4 0.0 39648 14796 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25462 0.0 0.0 21474956172 10800 ? S 06:54 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25469 0.0 0.0 4336 800 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25471 0.0 0.0 11128 988 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgd2tjn1, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgd2tjn1' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 25371 0.4 0.0 39800 14824 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25472 0.0 0.0 21474956172 10720 ? S 06:54 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgd2tjn1 build 25479 0.0 0.0 4336 804 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25481 0.0 0.0 11128 992 ? S 06:54 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgd2tjn1, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgd2tjn1' > ls -l /proc/25371/fd total 0 lr-x------ 1 build build 64 Sep 24 06:54 0 -> pipe:[542642135] l-wx------ 1 build build 64 Sep 24 06:54 1 -> pipe:[542642136] lr-x------ 1 build build 64 Sep 24 06:54 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:54 2 -> pipe:[542642137] l-wx------ 1 build build 64 Sep 24 06:54 3 -> /dev/null > 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 > ps xua | grep osmo build 25371 0.4 0.0 39800 14824 ? S 06:54 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25482 0.0 0.0 21474956172 10956 ? S 06:54 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgd2tjn1 build 25489 0.0 0.0 4336 760 ? S 06:54 0:00 /bin/sh -c ps xua | grep osmo build 25491 0.0 0.0 11128 952 ? S 06:54 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:785: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Sep 24 06:55:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 06:55:55 +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_#5744?= In-Reply-To: <606423882.242.1537772082146.JavaMail.jenkins@jenkins.osmocom.org> References: <606423882.242.1537772082146.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <96239042.244.1537772155025.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.01 MB...] > 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 > ps xua | grep osmo build 3088 0.8 0.0 39744 14840 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3129 0.0 0.0 21474958428 11540 ? S 06:55 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9EmR5g build 3136 0.0 0.0 4336 808 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3138 0.0 0.0 11128 920 ? S 06:55 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9EmR5g, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg9EmR5g' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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 > ps xua | grep osmo build 3088 0.6 0.0 39744 14840 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3139 0.0 0.0 21474958428 11540 ? S 06:55 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9EmR5g build 3146 0.0 0.0 4336 728 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3148 0.0 0.0 11128 1040 ? S 06:55 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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 > ps xua | grep osmo build 3088 0.6 0.0 39744 14840 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3149 0.0 0.0 21475042604 21012 ? R 06:55 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 3156 0.0 0.0 4336 712 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3158 0.0 0.0 11128 1000 ? S 06:55 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWMybvF, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgWMybvF' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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 > ps xua | grep osmo build 3088 0.5 0.0 39648 14832 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3159 0.0 0.0 21474976440 14256 ? R 06:55 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWMybvF build 3166 0.0 0.0 4336 724 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3168 0.0 0.0 4336 108 ? R 06:55 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWMybvF, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgWMybvF' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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 > ps xua | grep osmo build 3088 0.5 0.0 39648 14832 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3169 0.0 0.0 21474976440 13488 ? R 06:55 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWMybvF build 3176 0.0 0.0 4336 804 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3178 0.0 0.0 11128 932 ? S 06:55 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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 > ps xua | grep osmo build 3088 0.5 0.0 39648 14832 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3179 0.0 0.0 21474962632 11084 ? S 06:55 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 3186 0.0 0.0 4336 764 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3188 0.0 0.0 11128 932 ? S 06:55 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgu8Vvl2, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgu8Vvl2' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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 > ps xua | grep osmo build 3088 0.5 0.0 39800 14860 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3189 0.0 0.0 21474962632 11140 ? S 06:55 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgu8Vvl2 build 3196 0.0 0.0 4336 724 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3198 0.0 0.0 11128 944 ? S 06:55 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgu8Vvl2, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgu8Vvl2' > ls -l /proc/3088/fd total 0 lr-x------ 1 build build 64 Sep 24 06:55 0 -> pipe:[542645644] l-wx------ 1 build build 64 Sep 24 06:55 1 -> pipe:[542645645] lr-x------ 1 build build 64 Sep 24 06:55 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:55 2 -> pipe:[542645646] l-wx------ 1 build build 64 Sep 24 06:55 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 3088 0.4 0.0 39800 14860 ? S 06:55 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3199 0.0 0.0 21474962636 11084 ? D 06:55 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgu8Vvl2 build 3206 0.0 0.0 4336 764 ? S 06:55 0:00 /bin/sh -c ps xua | grep osmo build 3208 0.0 0.0 11128 960 ? S 06:55 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 06:57:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 06:57:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5745?= In-Reply-To: <198391203.243.1537772093615.JavaMail.jenkins@jenkins.osmocom.org> References: <198391203.243.1537772093615.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1142994535.245.1537772220931.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 232.76 KB...] > ps xua | grep osmo build 25216 1.1 0.0 39744 14836 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25257 0.0 0.0 21474958428 11200 ? S 06:56 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgPsuzYf build 25264 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25266 0.0 0.0 4336 100 ? R 06:56 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgPsuzYf, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgPsuzYf' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 25216 1.1 0.0 39744 14836 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25267 0.0 0.0 21474958428 11304 ? S 06:56 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgPsuzYf build 25274 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25276 0.0 0.0 4336 100 ? R 06:56 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 25216 1.0 0.0 39744 14836 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25277 0.0 0.0 21475096348 33664 ? S 06:56 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25284 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25286 0.0 0.0 500 4 ? R 06:56 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgSTKiG2, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgSTKiG2' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 25216 0.9 0.0 39648 14828 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25287 0.0 0.0 21475096348 33664 ? S 06:56 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgSTKiG2 build 25294 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25296 0.0 0.0 11128 1028 ? S 06:56 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgSTKiG2, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgSTKiG2' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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 > ps xua | grep osmo build 25216 0.7 0.0 39648 14828 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25297 0.0 0.0 21475030184 21416 ? R 06:56 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgSTKiG2 build 25304 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25306 0.0 0.0 11128 1028 ? S 06:56 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25216 0.7 0.0 39648 14828 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25307 0.0 0.0 21474956172 10640 ? S 06:56 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25314 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25316 0.0 0.0 4336 100 ? R 06:56 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg9Lz6pf, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg9Lz6pf' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25216 0.7 0.0 39648 14828 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25317 0.0 0.0 21474956172 10700 ? S 06:56 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg9Lz6pf build 25324 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25326 0.0 0.0 11128 1028 ? R 06:56 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg9Lz6pf, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg9Lz6pf' > ls -l /proc/25216/fd total 0 lr-x------ 1 build build 64 Sep 24 06:56 0 -> pipe:[881491605] l-wx------ 1 build build 64 Sep 24 06:56 1 -> pipe:[881491606] lr-x------ 1 build build 64 Sep 24 06:56 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:56 2 -> pipe:[881491607] l-wx------ 1 build build 64 Sep 24 06:56 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25216 0.7 0.0 39648 14828 ? S 06:56 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25327 0.0 0.0 21474956172 10740 ? S 06:56 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg9Lz6pf build 25334 0.0 0.0 4336 728 ? S 06:56 0:00 /bin/sh -c ps xua | grep osmo build 25336 0.0 0.0 11128 1028 ? R 06:56 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory '/build/tests' Makefile:494: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 06:58:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 06:58:05 +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_#5745?= In-Reply-To: <96239042.244.1537772155025.JavaMail.jenkins@jenkins.osmocom.org> References: <96239042.244.1537772155025.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <126859534.246.1537772285448.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.01 MB...] > 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 > ps xua | grep osmo build 2721 1.5 0.0 39744 14836 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2762 0.0 0.0 21474958428 11200 ? S 06:57 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgSocVxK build 2769 0.0 0.0 4336 728 ? S 06:57 0:00 /bin/sh -c ps xua | grep osmo build 2771 0.0 0.0 11128 1028 ? S 06:57 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgSocVxK, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgSocVxK' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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 > ps xua | grep osmo build 2721 1.1 0.0 39744 14836 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2772 0.0 0.0 21474958428 11304 ? S 06:57 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgSocVxK build 2779 0.0 0.0 4336 728 ? S 06:57 0:00 /bin/sh -c ps xua | grep osmo build 2781 0.0 0.0 11128 1028 ? S 06:57 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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 > ps xua | grep osmo build 2721 1.1 0.0 39744 14836 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2782 0.0 0.0 21475108768 31064 ? R 06:57 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2789 0.0 0.0 4336 728 ? S 06:57 0:00 /bin/sh -c ps xua | grep osmo build 2791 0.0 0.0 11128 1028 ? S 06:57 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0Jeew, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgj0Jeew' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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 > ps xua | grep osmo build 2721 0.9 0.0 39648 14828 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2792 0.0 0.0 21474976444 14708 ? D 06:57 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0Jeew build 2799 0.0 0.0 4336 728 ? S 06:57 0:00 /bin/sh -c ps xua | grep osmo build 2801 0.0 0.0 11128 1028 ? S 06:57 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0Jeew, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgj0Jeew' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 2721 0.9 0.0 39648 14828 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2802 0.0 0.0 21475108768 35472 ? S 06:57 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0Jeew build 2809 0.0 0.0 4336 728 ? S 06:57 0:00 /bin/sh -c ps xua | grep osmo build 2811 0.0 0.0 11128 1028 ? S 06:57 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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 > ps xua | grep osmo build 2721 0.7 0.0 39648 14828 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2812 0.0 0.0 21474962632 10992 ? S 06:58 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2819 0.0 0.0 4336 728 ? S 06:58 0:00 /bin/sh -c ps xua | grep osmo build 2821 0.0 0.0 4336 100 ? R 06:58 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgR5PUBH, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgR5PUBH' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2721 0.8 0.0 39800 14856 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2822 0.0 0.0 21474962632 10984 ? S 06:58 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgR5PUBH build 2829 0.0 0.0 4336 728 ? S 06:58 0:00 /bin/sh -c ps xua | grep osmo build 2831 0.0 0.0 11128 1028 ? S 06:58 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgR5PUBH, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgR5PUBH' > ls -l /proc/2721/fd total 0 lr-x------ 1 build build 64 Sep 24 06:57 0 -> pipe:[881480542] l-wx------ 1 build build 64 Sep 24 06:57 1 -> pipe:[881480543] lr-x------ 1 build build 64 Sep 24 06:57 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 06:57 2 -> pipe:[881480544] l-wx------ 1 build build 64 Sep 24 06:57 3 -> /dev/null > 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 > ps xua | grep osmo build 2721 0.7 0.0 39800 14856 ? S 06:57 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2832 0.0 0.0 21474962636 11024 ? D 06:58 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgR5PUBH build 2839 0.0 0.0 4336 728 ? S 06:58 0:00 /bin/sh -c ps xua | grep osmo build 2841 0.0 0.0 11128 1028 ? S 06:58 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:785: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Sep 24 07:05:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 07:05:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5746?= In-Reply-To: <1142994535.245.1537772220931.JavaMail.jenkins@jenkins.osmocom.org> References: <1142994535.245.1537772220931.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <804827047.247.1537772729665.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 250.99 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 > ps xua | grep osmo build 25198 0.8 0.0 39748 14840 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25239 0.0 0.0 21474958428 10436 ? R 07:05 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9uoEET build 25246 0.0 0.0 4336 728 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25248 0.0 0.0 11128 996 ? R 07:05 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9uoEET, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg9uoEET' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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 > ps xua | grep osmo build 25198 0.7 0.0 39748 14840 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25249 0.0 0.0 21474958432 11084 ? R 07:05 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9uoEET build 25256 0.0 0.0 4336 720 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25258 0.0 0.0 11128 1040 ? S 07:05 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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 > ps xua | grep osmo build 25198 0.6 0.0 39748 14840 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25259 0.0 0.0 21475030184 21324 ? R 07:05 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25266 0.0 0.0 4336 808 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25268 0.0 0.0 11128 1028 ? S 07:05 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Ix3yH, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg_Ix3yH' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 25198 0.6 0.0 39908 14968 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25269 0.0 0.0 21475096348 29364 ? R 07:05 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Ix3yH build 25276 0.0 0.0 4336 712 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25278 0.0 0.0 11128 1028 ? S 07:05 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Ix3yH, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg_Ix3yH' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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 > ps xua | grep osmo build 25198 0.6 0.0 39908 14968 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25279 0.0 0.0 21475030184 17028 ? R 07:05 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Ix3yH build 25286 0.0 0.0 4336 804 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25288 0.0 0.0 4336 108 ? R 07:05 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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 > ps xua | grep osmo build 25198 0.5 0.0 39908 14968 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25289 0.0 0.0 21474956172 10584 ? S 07:05 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25296 0.0 0.0 4336 772 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25298 0.0 0.0 11128 1008 ? S 07:05 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgSK26hd, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgSK26hd' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25198 0.6 0.0 39908 14968 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25299 0.0 0.0 21474956176 10804 ? D 07:05 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgSK26hd build 25306 0.0 0.0 4336 804 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25308 0.0 0.0 11128 988 ? S 07:05 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgSK26hd, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgSK26hd' > ls -l /proc/25198/fd total 0 lr-x------ 1 build build 64 Sep 24 07:05 0 -> pipe:[1430193606] l-wx------ 1 build build 64 Sep 24 07:05 1 -> pipe:[1430193607] lr-x------ 1 build build 64 Sep 24 07:05 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:05 2 -> pipe:[1430193608] l-wx------ 1 build build 64 Sep 24 07:05 3 -> /dev/null > 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 > ps xua | grep osmo build 25198 0.5 0.0 39908 14968 ? S 07:05 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25309 0.0 0.0 21474956176 10780 ? D 07:05 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgSK26hd build 25316 0.0 0.0 4336 736 ? S 07:05 0:00 /bin/sh -c ps xua | grep osmo build 25318 0.0 0.0 11128 1048 ? S 07:05 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:785: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Sep 24 07:06:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 07:06:41 +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_#5746?= In-Reply-To: <126859534.246.1537772285448.JavaMail.jenkins@jenkins.osmocom.org> References: <126859534.246.1537772285448.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <752785601.248.1537772801923.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.10 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 2713 1.4 0.0 39744 14844 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2754 0.0 0.0 21474958428 11200 ? S 07:06 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgtjidII build 2761 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2763 0.0 0.0 11128 1028 ? S 07:06 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgtjidII, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgtjidII' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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 > ps xua | grep osmo build 2713 1.2 0.0 39744 14844 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2764 1.0 0.0 21474958428 11304 ? S 07:06 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgtjidII build 2771 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2773 0.0 0.0 11128 1028 ? S 07:06 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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:4251 *:* LISTEN 0 10 127.0.0.1:4245 *:* > ps xua | grep osmo build 2713 1.1 0.0 39744 14844 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2774 0.0 0.0 21475108768 35284 ? S 07:06 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2781 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2783 0.0 0.0 8836 372 ? R 07:06 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgOjNPfq, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgOjNPfq' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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 > ps xua | grep osmo build 2713 1.0 0.0 39620 14800 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2784 0.0 0.0 21475042604 17080 ? R 07:06 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgOjNPfq build 2791 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2793 0.0 0.0 11128 1028 ? R 07:06 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgOjNPfq, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgOjNPfq' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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 > ps xua | grep osmo build 2713 1.0 0.0 39620 14800 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2794 0.0 0.0 21475042604 14896 ? R 07:06 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgOjNPfq build 2801 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2803 0.0 0.0 11128 1028 ? S 07:06 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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 > ps xua | grep osmo build 2713 0.9 0.0 39620 14800 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2804 0.0 0.0 21474962632 10992 ? S 07:06 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2811 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2813 0.0 0.0 11128 1028 ? S 07:06 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgxA7UVK, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgxA7UVK' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2713 0.8 0.0 39620 14800 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2814 0.0 0.0 21474962632 10984 ? S 07:06 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgxA7UVK build 2821 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2823 0.0 0.0 11128 1028 ? S 07:06 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgxA7UVK, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgxA7UVK' > ls -l /proc/2713/fd total 0 lr-x------ 1 build build 64 Sep 24 07:06 0 -> pipe:[882131825] l-wx------ 1 build build 64 Sep 24 07:06 1 -> pipe:[882131826] lr-x------ 1 build build 64 Sep 24 07:06 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:06 2 -> pipe:[882131827] l-wx------ 1 build build 64 Sep 24 07:06 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2713 0.8 0.0 39620 14800 ? S 07:06 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2824 0.0 0.0 21474962632 11024 ? S 07:06 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgxA7UVK build 2831 0.0 0.0 4336 728 ? S 07:06 0:00 /bin/sh -c ps xua | grep osmo build 2833 0.0 0.0 11016 524 ? R 07:06 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 Mon Sep 24 07:25:52 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 24 Sep 2018 07:25:52 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11060 to look at the new patch set (#4). Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (choosen) configuration bits with the assignment complete message. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 8 files changed, 139 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/4 -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 07:36:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 07:36:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5747?= In-Reply-To: <804827047.247.1537772729665.JavaMail.jenkins@jenkins.osmocom.org> References: <804827047.247.1537772729665.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <414652065.250.1537774609341.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 247.67 KB...] > 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 > ps xua | grep osmo build 25210 1.0 0.0 39744 14836 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25251 0.0 0.0 21474958428 11200 ? S 07:36 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgllP1Qj build 25258 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25260 0.0 0.0 4336 100 ? R 07:36 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgllP1Qj, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgllP1Qj' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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 > ps xua | grep osmo build 25210 0.7 0.0 39744 14836 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25261 0.0 0.0 21474958428 11304 ? S 07:36 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgllP1Qj build 25268 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25270 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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 > ps xua | grep osmo build 25210 0.7 0.0 39744 14836 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25271 0.0 0.0 21474964020 11980 ? R 07:36 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25278 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25280 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnlBEIZ, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgnlBEIZ' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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 > ps xua | grep osmo build 25210 0.7 0.0 39648 14828 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25281 0.0 0.0 21475030184 18364 ? R 07:36 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnlBEIZ build 25288 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25290 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnlBEIZ, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgnlBEIZ' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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 > ps xua | grep osmo build 25210 0.7 0.0 39648 14828 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25291 0.0 0.0 21474964024 12904 ? R 07:36 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnlBEIZ build 25298 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25300 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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 > ps xua | grep osmo build 25210 0.6 0.0 39648 14828 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25301 0.0 0.0 21474956172 10640 ? S 07:36 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25308 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25310 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgg7OBgh, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgg7OBgh' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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 > ps xua | grep osmo build 25210 0.6 0.0 39800 14856 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25311 0.0 0.0 21474956172 10700 ? S 07:36 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgg7OBgh build 25318 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25320 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgg7OBgh, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgg7OBgh' > ls -l /proc/25210/fd total 0 lr-x------ 1 build build 64 Sep 24 07:36 0 -> pipe:[883116824] l-wx------ 1 build build 64 Sep 24 07:36 1 -> pipe:[883116825] lr-x------ 1 build build 64 Sep 24 07:36 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:36 2 -> pipe:[883116826] l-wx------ 1 build build 64 Sep 24 07:36 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25210 0.5 0.0 39800 14856 ? S 07:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25321 0.0 0.0 21474956172 10740 ? S 07:36 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgg7OBgh build 25328 0.0 0.0 4336 728 ? S 07:36 0:00 /bin/sh -c ps xua | grep osmo build 25330 0.0 0.0 11128 1028 ? S 07:36 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:785: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Sep 24 07:37:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 07:37:52 +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_#5747?= In-Reply-To: <752785601.248.1537772801923.JavaMail.jenkins@jenkins.osmocom.org> References: <752785601.248.1537772801923.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1511477937.251.1537774672778.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.09 MB...] > 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 > ps xua | grep osmo build 2759 1.0 0.0 39744 14836 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2800 0.0 0.0 21474958428 11200 ? S 07:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgKYXrlr build 2807 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2809 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgKYXrlr, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgKYXrlr' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 1.0 0.0 39744 14836 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2810 0.0 0.0 21474958428 11304 ? S 07:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgKYXrlr build 2817 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2819 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 0.7 0.0 39744 14836 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2820 0.0 0.0 21474976444 14708 ? D 07:37 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2827 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2829 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkcPPZH, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgkcPPZH' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 0.8 0.0 39648 14828 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2830 0.0 0.0 21474976444 14708 ? D 07:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkcPPZH build 2837 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2839 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkcPPZH, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgkcPPZH' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 0.7 0.0 39648 14828 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2840 0.0 0.0 21474976440 13688 ? R 07:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkcPPZH build 2847 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2849 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 0.6 0.0 39648 14828 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2850 0.0 0.0 21474962632 10992 ? S 07:37 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2857 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2859 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgtPc7DO, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgtPc7DO' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 0.6 0.0 39800 14856 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2860 0.0 0.0 21474962632 10984 ? S 07:37 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgtPc7DO build 2867 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2869 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgtPc7DO, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgtPc7DO' > ls -l /proc/2759/fd total 0 lr-x------ 1 build build 64 Sep 24 07:37 0 -> pipe:[883125391] l-wx------ 1 build build 64 Sep 24 07:37 1 -> pipe:[883125392] lr-x------ 1 build build 64 Sep 24 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:37 2 -> pipe:[883125393] l-wx------ 1 build build 64 Sep 24 07:37 3 -> /dev/null > 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 > ps xua | grep osmo build 2759 0.6 0.0 39800 14856 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2870 0.0 0.0 21474962636 11024 ? D 07:37 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgtPc7DO build 2877 0.0 0.0 4336 728 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 2879 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) ERRORS: 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 07:39:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 07:39:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5748?= In-Reply-To: <414652065.250.1537774609341.JavaMail.jenkins@jenkins.osmocom.org> References: <414652065.250.1537774609341.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1648093419.252.1537774753300.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 249.63 KB...] > 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 > ps xua | grep osmo build 25823 1.3 0.0 39744 14908 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25864 0.0 0.0 21474958428 11440 ? S 07:39 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgCd9qYf build 25871 0.0 0.0 4336 772 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25873 0.0 0.0 11128 996 ? S 07:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgCd9qYf, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgCd9qYf' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 1.1 0.0 39744 14908 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25874 0.0 0.0 21474958428 11700 ? S 07:39 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgCd9qYf build 25881 0.0 0.0 4336 756 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25883 0.0 0.0 11128 1040 ? S 07:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 1.0 0.0 39744 14908 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25884 0.0 0.0 21474964024 13088 ? D 07:39 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25891 0.0 0.0 4336 764 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25893 0.0 0.0 11128 972 ? S 07:39 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg5VQaBe, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg5VQaBe' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 1.0 0.0 39744 14952 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25894 0.0 0.0 21474964024 13072 ? D 07:39 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg5VQaBe build 25901 0.0 0.0 4336 736 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25903 0.0 0.0 11128 1036 ? S 07:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg5VQaBe, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg5VQaBe' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 0.8 0.0 39744 14952 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25904 0.0 0.0 21474964024 12864 ? R 07:39 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg5VQaBe build 25911 0.0 0.0 4336 800 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25913 0.0 0.0 11128 944 ? S 07:39 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 0.7 0.0 39744 14952 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25914 0.0 0.0 21474956172 10724 ? S 07:39 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25921 0.0 0.0 4336 768 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25923 0.0 0.0 11128 1028 ? S 07:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg5Ea3gO, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg5Ea3gO' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 0.6 0.0 39744 14952 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25924 0.0 0.0 21474956176 10744 ? D 07:39 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg5Ea3gO build 25931 0.0 0.0 4336 808 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25933 0.0 0.0 11128 1040 ? S 07:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg5Ea3gO, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg5Ea3gO' > ls -l /proc/25823/fd total 0 lr-x------ 1 build build 64 Sep 24 07:38 0 -> pipe:[543240947] l-wx------ 1 build build 64 Sep 24 07:38 1 -> pipe:[543240948] lr-x------ 1 build build 64 Sep 24 07:38 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:38 2 -> pipe:[543240949] l-wx------ 1 build build 64 Sep 24 07:38 3 -> /dev/null > 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 > ps xua | grep osmo build 25823 0.7 0.0 39744 14952 ? S 07:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25934 0.0 0.0 21474956176 10960 ? R 07:39 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg5Ea3gO build 25941 0.0 0.0 4336 804 ? S 07:39 0:00 /bin/sh -c ps xua | grep osmo build 25943 0.0 0.0 11128 940 ? S 07:39 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 07:40:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 07:40:33 +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_#5748?= In-Reply-To: <1511477937.251.1537774672778.JavaMail.jenkins@jenkins.osmocom.org> References: <1511477937.251.1537774672778.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1268696004.253.1537774833079.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.01 MB...] > 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 > ps xua | grep osmo build 2961 0.8 0.0 39744 14836 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3002 0.0 0.0 21474958428 11200 ? S 07:40 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgCKjkWP build 3009 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3011 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgCKjkWP, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgCKjkWP' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.6 0.0 39744 14836 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3012 0.0 0.0 21474958428 10912 ? R 07:40 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgCKjkWP build 3019 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3021 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.7 0.0 39744 14836 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3022 0.0 0.0 21474976440 12588 ? R 07:40 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 3029 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3031 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWqpaOe, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgWqpaOe' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.7 0.0 39648 14828 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3032 0.0 0.0 21474976444 14708 ? D 07:40 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWqpaOe build 3039 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3041 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWqpaOe, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgWqpaOe' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.6 0.0 39648 14828 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3042 0.0 0.0 21475042604 19644 ? R 07:40 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgWqpaOe build 3049 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3051 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.6 0.0 39648 14828 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3052 0.0 0.0 21474962632 10992 ? S 07:40 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 3059 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3061 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg8gNUhX, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg8gNUhX' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.5 0.0 39800 14856 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3062 0.0 0.0 21474962632 10984 ? S 07:40 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg8gNUhX build 3069 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3071 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg8gNUhX, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg8gNUhX' > ls -l /proc/2961/fd total 0 lr-x------ 1 build build 64 Sep 24 07:40 0 -> pipe:[883196810] l-wx------ 1 build build 64 Sep 24 07:40 1 -> pipe:[883196811] lr-x------ 1 build build 64 Sep 24 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 07:40 2 -> pipe:[883196812] l-wx------ 1 build build 64 Sep 24 07:40 3 -> /dev/null > 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 > ps xua | grep osmo build 2961 0.5 0.0 39800 14856 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3072 0.0 0.0 21474962632 11024 ? S 07:40 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg8gNUhX build 3079 0.0 0.0 4336 728 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 3081 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory '/build/tests' Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:785: recipe for target 'check' failed + 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 Mon Sep 24 08:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 08:23:23 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Add osmo-iuh builds In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11029 ) Change subject: jobs: osmo-gsm-tester: Add osmo-iuh builds ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11029 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: I7b8f51597287e7673f79c65eae2508b074151781 Gerrit-Change-Number: 11029 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 24 Sep 2018 08:23: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 Sep 24 08:23:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 08:23:37 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11030 ) Change subject: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact ...................................................................... Patch Set 2: Code-Review+2 Hey Pau, why don't you +2 yourself? -- To view, visit https://gerrit.osmocom.org/11030 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: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 Gerrit-Change-Number: 11030 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 24 Sep 2018 08:23: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 Sep 24 08:23:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 08:23:44 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verifica... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11038 ) Change subject: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11038 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: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a Gerrit-Change-Number: 11038 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 24 Sep 2018 08:23: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 Sep 24 09:36:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 24 Sep 2018 09:36:06 +0000 Subject: Change in osmo-bsc[master]: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11058 to look at the new patch set (#3). Change subject: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() ...................................................................... gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() At the moment we do not initalize the struct members mr_full and mr_half in struct gsm_bts. The user still has the option to configure reasonable values via vty, but when not VTY configuration is made, the flags for the AMR rates will be all zero. Lets initalize the struct members with reasonable defaults. - Make sure gsm_bts_alloc() populates fr_half and fr_full with reasonable defaults. Change-Id: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Related: OS#3548 --- M src/osmo-bsc/gsm_data.c 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/11058/3 -- To view, visit https://gerrit.osmocom.org/11058 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: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Gerrit-Change-Number: 11058 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 Sep 24 09:47:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 24 Sep 2018 09:47:03 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10965 ) Change subject: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10965 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: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Gerrit-Change-Number: 10965 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 24 Sep 2018 09:47:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 10:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 10:53:37 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: only include speech codec (choosen) on AoIP networks In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11059 ) Change subject: assignment_fsm: only include speech codec (choosen) on AoIP networks ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11059 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: Ic7f28aacc953d96ebf3aa04f3e1810475458c1a8 Gerrit-Change-Number: 11059 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 24 Sep 2018 10:53:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 10:59:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 10:59:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5749?= In-Reply-To: <1648093419.252.1537774753300.JavaMail.jenkins@jenkins.osmocom.org> References: <1648093419.252.1537774753300.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <676089416.256.1537786769970.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 249.16 KB...] > 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 > ps xua | grep osmo build 26045 1.0 0.0 39744 14880 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26086 0.0 0.0 21474958428 11220 ? S 10:59 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgGuE6kW build 26093 0.0 0.0 4336 768 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26095 0.0 0.0 11128 944 ? S 10:59 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgGuE6kW, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgGuE6kW' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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 > ps xua | grep osmo build 26045 0.8 0.0 39744 14880 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26096 0.0 0.0 21474958428 11496 ? S 10:59 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgGuE6kW build 26103 0.0 0.0 4336 736 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26105 0.0 0.0 11128 1024 ? S 10:59 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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 > ps xua | grep osmo build 26045 0.9 0.0 39744 14880 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26106 0.0 0.0 21474964024 13072 ? D 10:59 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 26113 0.0 0.0 4336 800 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26115 0.0 0.0 11128 1048 ? S 10:59 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgPb_hOL, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgPb_hOL' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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 > ps xua | grep osmo build 26045 0.9 0.0 39744 14932 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26116 0.0 0.0 21474964020 13060 ? R 10:59 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgPb_hOL build 26123 0.0 0.0 4336 724 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26125 0.0 0.0 11128 960 ? S 10:59 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgPb_hOL, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgPb_hOL' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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 > ps xua | grep osmo build 26045 0.8 0.0 39744 14932 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26126 0.0 0.0 21474964024 12896 ? R 10:59 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgPb_hOL build 26133 0.0 0.0 4336 712 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26135 0.0 0.0 4336 104 ? R 10:59 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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 > ps xua | grep osmo build 26045 0.7 0.0 39744 14932 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26136 0.0 0.0 21474956172 10824 ? S 10:59 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 26143 0.0 0.0 4336 768 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26145 0.0 0.0 11128 936 ? S 10:59 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg1YnzU_, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg1YnzU_' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 26045 0.7 0.0 39744 14932 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26146 0.0 0.0 21474956172 10780 ? R 10:59 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg1YnzU_ build 26153 0.0 0.0 4336 772 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26155 0.0 0.0 11128 1000 ? S 10:59 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg1YnzU_, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg1YnzU_' > ls -l /proc/26045/fd total 0 lr-x------ 1 build build 64 Sep 24 10:59 0 -> pipe:[545410061] l-wx------ 1 build build 64 Sep 24 10:59 1 -> pipe:[545410062] lr-x------ 1 build build 64 Sep 24 10:59 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 10:59 2 -> pipe:[545410063] l-wx------ 1 build build 64 Sep 24 10:59 3 -> /dev/null > 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 > ps xua | grep osmo build 26045 0.7 0.0 39744 14932 ? S 10:59 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 26156 0.0 0.0 21474956176 10868 ? D 10:59 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg1YnzU_ build 26163 0.0 0.0 4336 716 ? S 10:59 0:00 /bin/sh -c ps xua | grep osmo build 26165 0.0 0.0 500 4 ? R 10:59 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 11:01:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 11:01:12 +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_#5749?= In-Reply-To: <1268696004.253.1537774833079.JavaMail.jenkins@jenkins.osmocom.org> References: <1268696004.253.1537774833079.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1599284478.257.1537786872941.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.09 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 2696 1.2 0.0 39744 14844 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2737 0.0 0.0 21474958428 11204 ? S 11:01 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgZmY_wP build 2744 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2746 0.0 0.0 11128 1028 ? S 11:01 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgZmY_wP, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgZmY_wP' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 2696 1.2 0.0 39744 14844 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2747 0.0 0.0 21474958428 11308 ? S 11:01 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgZmY_wP build 2754 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2756 0.0 0.0 11128 1028 ? S 11:01 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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 > ps xua | grep osmo build 2696 1.0 0.0 39744 14844 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2757 0.0 0.0 21475108768 27900 ? R 11:01 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2764 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2766 0.0 0.0 11128 1028 ? R 11:01 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgl7MeNU, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgl7MeNU' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 2696 1.0 0.0 39620 14800 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2767 0.0 0.0 21475108768 35024 ? R 11:01 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgl7MeNU build 2774 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2776 0.0 0.0 11128 1028 ? S 11:01 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgl7MeNU, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgl7MeNU' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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 > ps xua | grep osmo build 2696 0.9 0.0 39620 14800 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2777 0.0 0.0 21474976444 14900 ? D 11:01 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgl7MeNU build 2784 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2786 0.0 0.0 11128 1028 ? S 11:01 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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 > ps xua | grep osmo build 2696 0.8 0.0 39620 14800 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2787 0.0 0.0 21474962632 10992 ? S 11:01 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2794 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2796 0.0 0.0 4336 100 ? R 11:01 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgI9tgt5, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgI9tgt5' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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 > ps xua | grep osmo build 2696 0.8 0.0 39620 14800 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2797 0.0 0.0 21474962632 10984 ? S 11:01 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgI9tgt5 build 2804 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2806 0.0 0.0 11128 1028 ? S 11:01 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgI9tgt5, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgI9tgt5' > ls -l /proc/2696/fd total 0 lr-x------ 1 build build 64 Sep 24 11:00 0 -> pipe:[886295489] l-wx------ 1 build build 64 Sep 24 11:00 1 -> pipe:[886295490] lr-x------ 1 build build 64 Sep 24 11:00 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 11:00 2 -> pipe:[886295491] l-wx------ 1 build build 64 Sep 24 11:00 3 -> /dev/null > 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 > ps xua | grep osmo build 2696 0.7 0.0 39620 14800 ? S 11:00 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2807 0.0 0.0 21474962632 11024 ? S 11:01 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgI9tgt5 build 2814 0.0 0.0 4336 728 ? S 11:01 0:00 /bin/sh -c ps xua | grep osmo build 2816 0.0 0.0 11128 1028 ? S 11:01 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) ERRORS: 1 make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 Mon Sep 24 11:10:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 11:10:23 +0000 Subject: Change in osmo-bsc[master]: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11058 ) Change subject: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11058 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: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Gerrit-Change-Number: 11058 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 24 Sep 2018 11: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 Mon Sep 24 11:11:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 11:11:10 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10965 ) Change subject: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10965 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: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Gerrit-Change-Number: 10965 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 24 Sep 2018 11:11:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 11:14:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 11:14:28 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11060/5/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11060/5/src/osmo-bsc/handover_fsm.c at 565 PS5, Line 565: /* FIXME: use the value in s15_s0 that has been computed by I think it's best to fix this right now to avoid forgetting about it later on. Isn't it basically simply setting the resulting bits in the lchan that is selected below (IF it is an AMR codec type)? If you really don't want to fix this here, I suggest to at least open an issue on osmocom.org and changing this FIXME in to a #warning or related pragma... -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 24 Sep 2018 11:14:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 11:14:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 11:14:30 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: only include speech codec (choosen) on AoIP networks In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11059 ) Change subject: assignment_fsm: only include speech codec (choosen) on AoIP networks ...................................................................... assignment_fsm: only include speech codec (choosen) on AoIP networks The field speech codec (choosen) in the ASSIGNMENT COMPLETE message has been specified with AoIP. Since sccp-lite has been specified before AoIP, we should not include the speech codec (choosen) field in the ASSIGNMENT COMPLETE, when osmo-bsc is connected to an sccp-lite based network. - make sure speech codec (choosen) is only included on AoIP based networks Change-Id: Ic7f28aacc953d96ebf3aa04f3e1810475458c1a8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 63776f0..5304d6c 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -165,10 +165,14 @@ addr_local_p = &addr_local; } - /* Extrapolate speech codec from speech mode */ - /* FIXME: AMR codec configuration must be derived from lchan1! */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ + /* Only AoIP networks include a speech codec (choosen) in the + * assignment complete message. */ + if (gscon_is_aoip(conn)) { + /* Extrapolate speech codec from speech mode */ + /* FIXME: AMR codec configuration must be derived from lchan1! */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ + } } resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, -- To view, visit https://gerrit.osmocom.org/11059 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: Ic7f28aacc953d96ebf3aa04f3e1810475458c1a8 Gerrit-Change-Number: 11059 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 Mon Sep 24 11:14:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 11:14:31 +0000 Subject: Change in osmo-bsc[master]: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11058 ) Change subject: gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() ...................................................................... gsm_data.c: Set reasonable AMR codec defaults in gsm_bts_alloc() At the moment we do not initalize the struct members mr_full and mr_half in struct gsm_bts. The user still has the option to configure reasonable values via vty, but when not VTY configuration is made, the flags for the AMR rates will be all zero. Lets initalize the struct members with reasonable defaults. - Make sure gsm_bts_alloc() populates fr_half and fr_full with reasonable defaults. Change-Id: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Related: OS#3548 --- M src/osmo-bsc/gsm_data.c 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 0718e91..8d0b831 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -774,6 +774,7 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) { struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); + struct gsm48_multi_rate_conf mr_cfg; int i; if (!bts) @@ -885,6 +886,33 @@ .amr = 1, }; + /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. + * It is possible to set up to 4 codecs per active set, while 5,15K must + * be selected. */ + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 0, + .m5_15 = 1, + .m5_90 = 1, + .m6_70 = 0, + .m7_40 = 0, + .m7_95 = 0, + .m10_2 = 1, + .m12_2 = 1 + }; + memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 0, + .m5_15 = 1, + .m5_90 = 1, + .m6_70 = 0, + .m7_40 = 1, + .m7_95 = 1, + .m10_2 = 0, + .m12_2 = 0 + }; + memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + return bts; } -- To view, visit https://gerrit.osmocom.org/11058 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: I68747ae6dd2582e2a7d60337d9f2c43bd06ac525 Gerrit-Change-Number: 11058 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 Mon Sep 24 11:14:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 11:14:31 +0000 Subject: Change in osmo-bsc[master]: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10965 ) Change subject: codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION ...................................................................... codec_pref: Add Codec List to COMPLETE LAYER 3 INFORMATION The COMPLETE LAYER 3 INFORMATION message lacks the Codec List (BSS Supported) information element. This information element is mandatory for networks that use an IP based user plane (AoIP). - Add function to generate the speech codec list from the current codec settings (Available codecs) - Generate and embed information element in L3 Compl. message Depends: libosmocore I4e656731b16621736c7a2f4e64d9ce63b1064e98 Change-Id: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Related: OS#3548 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c M src/osmo-bsc/gsm_08_08.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 5 files changed, 1,240 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 94fc987..09aaa60 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -7,6 +7,8 @@ struct gsm0808_speech_codec_list; struct gsm_audio_support; struct bts_codec_conf; +struct bsc_msc_data; +struct gsm_bts; int match_codec_pref(enum gsm48_chan_mode *chan_mode, bool *full_rate, @@ -15,3 +17,7 @@ struct gsm_audio_support * const *audio_support, int audio_length, const struct bts_codec_conf *bts_codec); + +void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, + const struct bsc_msc_data *msc, + const struct gsm_bts *bts); diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 924f77f..c998e60 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -242,3 +242,68 @@ return 0; } + +/*! Determine the BSS supported speech codec list that is sent to the MSC with + * the COMPLETE LAYER 3 INFORMATION message. + * \param[out] scl GSM 08.08 speech codec list with BSS supported codecs. + * \param[in] msc associated msc (current codec settings). + * \param[in] bts associated bts (current codec settings). */ +void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, + const struct bsc_msc_data *msc, const struct gsm_bts *bts) +{ + uint8_t perm_spch; + unsigned int i; + int rc; + uint16_t amr_s15_s0_bts; + uint16_t amr_s15_s0_msc; + uint16_t amr_s15_s0; + const struct gsm48_multi_rate_conf *amr_cfg_bts; + const struct gsm48_multi_rate_conf *amr_cfg_msc; + + memset(scl, 0, sizeof(*scl)); + + for (i = 0; i < msc->audio_length; i++) { + + /* Pick a permitted speech value from the global codec configuration list */ + perm_spch = audio_support_to_gsm88(msc->audio_support[i]); + + /* Check this permitted speech value against the BTS specific parameters. + * if the BTS does not support the codec, try the next one */ + if (!test_codec_support_bts(&bts->codec, perm_spch)) + continue; + + /* Write item into codec list */ + rc = gsm0808_speech_codec_from_chan_type(&scl->codec[scl->len], perm_spch); + if (rc != 0) + continue; + + /* AMR (HR/FR version 3) is the only codec that requires a codec + * configuration (S0-S15). Determine the current configuration and update + * the cfg flag. */ + if (msc->audio_support[i]->ver == 3) { + + /* First lookup the BTS specific AMR rate configuration. Thsi config + * is set via the VTY for each BTS individually. In cases where no + * configuration is set we will assume a safe default */ + if (msc->audio_support[i]->hr) { + amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; + amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, false); + } else { + amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, true); + } + + /* At next, lookup the AMR rate configuration that is set for the MSC */ + amr_cfg_msc = &msc->amr_conf; + amr_s15_s0_msc = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_msc, true); + + /* Calculate the intersection of the two configurations and update S0-S15 + * in the codec list. */ + amr_s15_s0 = amr_s15_s0_bts & amr_s15_s0_msc; + scl->codec[scl->len].cfg = amr_s15_s0; + } + + scl->len++; + } +} + diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 0d7cdf0..807eb8c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -446,6 +447,7 @@ char *imsi = NULL; struct msgb *resp; enum bsc_con ret; + struct gsm0808_speech_codec_list scl; /* Check the filter */ rc = bsc_filter_initial(msc->network->bsc_data, msc, conn, msg, @@ -491,7 +493,12 @@ bsc_scan_bts_msg(conn, msg); - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); + if (gscon_is_aoip(conn)) { + gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + } else + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); + if (!resp) { LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n"); return false; diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index efc77f6..20e3525 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -201,6 +201,17 @@ OSMO_ASSERT(config_no < N_CONFIG_VARIANTS); + /* Setup an AMR configuration, this configuration is separate and does + * not influence other codecs than AMR */ + msc->amr_conf.m4_75 = 1; + msc->amr_conf.m5_15 = 1; + msc->amr_conf.m5_90 = 1; + msc->amr_conf.m6_70 = 1; + msc->amr_conf.m7_40 = 1; + msc->amr_conf.m7_95 = 1; + msc->amr_conf.m10_2 = 1; + msc->amr_conf.m12_2 = 1; + switch (config_no) { case 0: /* FR1 only */ @@ -282,11 +293,36 @@ { /* Note: FR is supported by all BTSs, so there is no flag for it */ + struct gsm48_multi_rate_conf *cfg; + OSMO_ASSERT(config_no < N_CONFIG_VARIANTS); bts->codec.hr = 0; bts->codec.efr = 0; bts->codec.amr = 0; + memset(&bts->mr_full.gsm48_ie, 0, sizeof(bts->mr_full.gsm48_ie)); + memset(&bts->mr_full.gsm48_ie, 0, sizeof(bts->mr_half.gsm48_ie)); + + /* Setup an AMR configuration, this configuration is separate and does + * not influence other codecs than AMR */ + cfg = (struct gsm48_multi_rate_conf*) &bts->mr_full.gsm48_ie; + cfg->m4_75 = 1; + cfg->m5_15 = 1; + cfg->m5_90 = 1; + cfg->m6_70 = 1; + cfg->m7_40 = 1; + cfg->m7_95 = 1; + cfg->m10_2 = 1; + cfg->m12_2 = 1; + cfg = (struct gsm48_multi_rate_conf*) &bts->mr_half.gsm48_ie; + cfg->m4_75 = 1; + cfg->m5_15 = 1; + cfg->m5_90 = 1; + cfg->m6_70 = 1; + cfg->m7_40 = 1; + cfg->m7_95 = 1; + cfg->m10_2 = 0; + cfg->m12_2 = 0; switch (config_no) { case 0: @@ -590,6 +626,62 @@ free_msc_config(&msc_local); } +/* Try execute bss_supp_codec_list(), display input and output parameters */ +static void test_gen_bss_supported_codec_list(const struct bsc_msc_data *msc, struct gsm_bts *bts) +{ + unsigned int i; + struct gsm0808_speech_codec_list scl; + + printf("Determining Codec List (BSS Supported):\n"); + + printf(" * BSS: audio support settings (%u items):\n", msc->audio_length); + for (i = 0; i < msc->audio_length; i++) + if (msc->audio_support[i]->hr) + printf(" audio_support[%u]=HR%u\n", i, msc->audio_support[i]->ver); + else + printf(" audio_support[%u]=FR%u\n", i, msc->audio_support[i]->ver); + + printf(" * BTS: audio support settings:\n"); + printf(" (GSM-FR implicitly supported)\n"); + printf(" codec->hr=%u\n", bts->codec.hr); + printf(" codec->efr=%u\n", bts->codec.efr); + printf(" codec->amr=%u\n", bts->codec.amr); + + gen_bss_supported_codec_list(&scl, msc, bts); + + printf(" * result: speech codec list (%u items):\n", scl.len); + for (i = 0; i < scl.len; i++) { + printf(" codec[%u]->type=%s", i, gsm0808_speech_codec_type_name(scl.codec[i].type)); + if (msc->audio_support[i]->ver == 3) + printf(" S15-S0=%04x", scl.codec[i].cfg); + printf("\n"); + } + printf("\n"); +} + +/* Test gen_bss_supported_codec_list() with some mixed configurations */ +static void test_gen_bss_supported_codec_list_cfgs(void) +{ + struct bsc_msc_data msc_local; + struct gsm_bts bts_local; + uint8_t i; + uint8_t k; + + printf("============== test_gen_bss_supp_codec_list_cfgs ==============\n\n"); + init_msc_config(&msc_local); + + for (i = 0; i < N_CONFIG_VARIANTS; i++) { + for (k = 0; k < N_CONFIG_VARIANTS; k++) { + make_msc_config(&msc_local, i); + make_bts_config(&bts_local, k); + printf("MSC config: %u, BTS config: %u\n", i, k); + test_gen_bss_supported_codec_list(&msc_local, &bts_local); + } + } + + free_msc_config(&msc_local); +} + static const struct log_info_cat log_categories[] = { [DMSC] = { .name = "DMSC", @@ -615,6 +707,7 @@ test_msc(); test_selected_working(); test_selected_non_working(); + test_gen_bss_supported_codec_list_cfgs(); printf("Testing execution completed.\n"); talloc_free(ctx); diff --git a/tests/codec_pref/codec_pref_test.ok b/tests/codec_pref/codec_pref_test.ok index 3b36ea1..befc497 100644 --- a/tests/codec_pref/codec_pref_test.ok +++ b/tests/codec_pref/codec_pref_test.ok @@ -1018,4 +1018,1072 @@ codec->amr=1 * result: rc=-1, full_rate=0, chan_mode=SIGNALLING +============== test_gen_bss_supp_codec_list_cfgs ============== + +MSC config: 0, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 0, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 1, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 1, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 1, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 1, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 1, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR1 + +MSC config: 2, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR2 + +MSC config: 2, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR2 + +MSC config: 2, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (0 items): + +MSC config: 2, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR2 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR2 + +MSC config: 3, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 3, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 3, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 3, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 3, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=FR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR3 S15-S0=57ff + +MSC config: 4, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 4, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 4, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (0 items): + +MSC config: 4, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 4, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (1 items): + audio_support[0]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=HR3 S15-S0=073f + +MSC config: 5, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 5, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 5, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 5, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 5, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (2 items): + audio_support[0]=FR1 + audio_support[1]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 6, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 6, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + +MSC config: 6, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 6, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=HR1 + +MSC config: 6, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 6, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=HR1 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=HR1 + +MSC config: 7, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 7, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 7, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 7, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 7, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (3 items): + audio_support[0]=FR1 + audio_support[1]=FR3 + audio_support[2]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 S15-S0=57ff + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 0 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=0 + * result: speech codec list (1 items): + codec[0]->type=FR1 + +MSC config: 8, BTS config: 1 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 8, BTS config: 2 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=1 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + +MSC config: 8, BTS config: 3 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 4 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 5 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=0 + codec->amr=0 + * result: speech codec list (2 items): + codec[0]->type=FR1 + codec[1]->type=HR1 + +MSC config: 8, BTS config: 6 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=0 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=HR1 S15-S0=0000 + +MSC config: 8, BTS config: 7 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=0 + codec->efr=0 + codec->amr=1 + * result: speech codec list (3 items): + codec[0]->type=FR1 + codec[1]->type=FR3 + codec[2]->type=HR3 S15-S0=073f + +MSC config: 8, BTS config: 8 +Determining Codec List (BSS Supported): + * BSS: audio support settings (5 items): + audio_support[0]=FR1 + audio_support[1]=FR2 + audio_support[2]=FR3 + audio_support[3]=HR1 + audio_support[4]=HR3 + * BTS: audio support settings: + (GSM-FR implicitly supported) + codec->hr=1 + codec->efr=1 + codec->amr=1 + * result: speech codec list (5 items): + codec[0]->type=FR1 + codec[1]->type=FR2 + codec[2]->type=FR3 S15-S0=57ff + codec[3]->type=HR1 + codec[4]->type=HR3 S15-S0=073f + Testing execution completed. -- To view, visit https://gerrit.osmocom.org/10965 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: Id6f2af3fdab45bf05f06aec03e222734d7a4cf70 Gerrit-Change-Number: 10965 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 13:49:12 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 24 Sep 2018 13:49:12 +0000 Subject: Change in pysim[master]: utils: fix encoding/decoding of IMSI value Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11073 Change subject: utils: fix encoding/decoding of IMSI value ...................................................................... utils: fix encoding/decoding of IMSI value When programming or reading a SIM with an IMSI shorter than 15, the IMSI value is incorrectly encoded/decoded. The code pads the the IMSI value with 0xF from the left but padding from the right would be correct. It also encodes the length as half the number of digits in the IMSI (rounded up). This isn't correct for even length IMSIs. With even length IMSIs, the odd/even parity bit bumps the last digit into an extra byte, which should be counted as well. - Fix endcoding of IMSI value - Fix decoding of IMSI value Change-Id: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Patch-by: Ben Foxmoore Closes: SYS#3552 --- M pySim/utils.py 1 file changed, 26 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/11073/1 diff --git a/pySim/utils.py b/pySim/utils.py index 17dc693..ba94702 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -49,11 +49,29 @@ def lpad(s, l, c='f'): return c * (l - len(s)) + s +def half_round_up(n): + return (n + 1)//2 + +# IMSI encoded format: +# For IMSI 0123456789ABCDE: +# +# | byte 1 | 2 upper | 2 lower | 3 upper | 3 lower | ... | 9 upper | 9 lower | +# | length in bytes | 0 | odd/even | 2 | 1 | ... | E | D | +# +# If the IMSI is less than 15 characters, it should be padded with 'f' from the end. +# +# The length is the total number of bytes used to encoded the IMSI. This includes the odd/even +# parity bit. E.g. an IMSI of length 14 is 8 bytes long, not 7, as it uses bytes 2 to 9 to +# encode itself. +# +# Because of this, an odd length IMSI fits exactly into len(imsi) + 1 // 2 bytes, whereas an +# even length IMSI only uses half of the last byte. + def enc_imsi(imsi): """Converts a string imsi into the value of the EF""" - l = (len(imsi) + 1) // 2 # Required bytes + l = half_round_up(len(imsi) + 1) # Required bytes - include space for odd/even indicator oe = len(imsi) & 1 # Odd (1) / Even (0) - ei = '%02x' % l + swap_nibbles(lpad('%01x%s' % ((oe<<3)|1, imsi), 16)) + ei = '%02x' % l + swap_nibbles('%01x%s' % ((oe<<3)|1, rpad(imsi, 15))) return ei def dec_imsi(ef): @@ -61,13 +79,15 @@ if len(ef) < 4: return None l = int(ef[0:2], 16) * 2 # Length of the IMSI string - swapped = swap_nibbles(ef[2:]) + l = l - 1 # Encoded length byte includes oe nibble + swapped = swap_nibbles(ef[2:]).rstrip('f') oe = (int(swapped[0])>>3) & 1 # Odd (1) / Even (0) - if oe: + if not oe: + # if even, only half of last byte was used l = l-1 - if l+1 > len(swapped): + if l != len(swapped) - 1: return None - imsi = swapped[1:l+2] + imsi = swapped[1:] return imsi def dec_iccid(ef): -- To view, visit https://gerrit.osmocom.org/11073 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: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Gerrit-Change-Number: 11073 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 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_#256?= In-Reply-To: <300607348.229.1537715406755.JavaMail.jenkins@jenkins.osmocom.org> References: <300607348.229.1537715406755.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1229592520.260.1537801806577.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_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_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_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 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_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 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.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 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 jenkins at lists.osmocom.org Mon Sep 24 16:08:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 16:08:28 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5750?= In-Reply-To: <676089416.256.1537786769970.JavaMail.jenkins@jenkins.osmocom.org> References: <676089416.256.1537786769970.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1703259488.261.1537805308982.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 248.66 KB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 25181 0.5 0.0 39748 14884 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25222 0.0 0.0 21474958428 11216 ? S 16:08 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgRjYn2w build 25229 0.0 0.0 4336 772 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25231 0.0 0.0 11128 1008 ? S 16:08 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgRjYn2w, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgRjYn2w' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 25181 0.4 0.0 39748 14884 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25232 0.0 0.0 21474958428 11620 ? S 16:08 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgRjYn2w build 25239 0.0 0.0 4336 772 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25241 0.0 0.0 11128 992 ? S 16:08 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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 > ps xua | grep osmo build 25181 0.4 0.0 39748 14884 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25242 0.0 0.0 21474964020 12020 ? R 16:08 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25249 0.0 0.0 4336 760 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25251 0.0 0.0 11128 964 ? S 16:08 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgBohlXl, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgBohlXl' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 25181 0.4 0.0 39908 15012 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25252 0.0 0.0 21475096348 33644 ? S 16:08 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgBohlXl build 25259 0.0 0.0 4336 768 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25261 0.0 0.0 11128 1004 ? S 16:08 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgBohlXl, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgBohlXl' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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 > ps xua | grep osmo build 25181 0.3 0.0 39908 15012 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25262 0.0 0.0 21475030184 17236 ? R 16:08 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgBohlXl build 25269 0.0 0.0 4336 716 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25271 0.0 0.0 11128 932 ? S 16:08 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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 > ps xua | grep osmo build 25181 0.4 0.0 39908 15012 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25272 0.0 0.0 21474956172 10196 ? R 16:08 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25279 0.0 0.0 4336 816 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25281 0.0 0.0 11128 936 ? S 16:08 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0PGQZI, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg0PGQZI' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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 > ps xua | grep osmo build 25181 0.3 0.0 39908 15012 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25282 0.0 0.0 21474956172 10824 ? S 16:08 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0PGQZI build 25289 0.0 0.0 4336 720 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25291 0.0 0.0 11128 948 ? S 16:08 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0PGQZI, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg0PGQZI' > ls -l /proc/25181/fd total 0 lr-x------ 1 build build 64 Sep 24 16:08 0 -> pipe:[1430902554] l-wx------ 1 build build 64 Sep 24 16:08 1 -> pipe:[1430902555] lr-x------ 1 build build 64 Sep 24 16:08 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:08 2 -> pipe:[1430902556] l-wx------ 1 build build 64 Sep 24 16:08 3 -> /dev/null > 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 > ps xua | grep osmo build 25181 0.4 0.0 39908 15012 ? S 16:08 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25292 0.0 0.0 21474956172 10920 ? S 16:08 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0PGQZI build 25299 0.0 0.0 4336 732 ? S 16:08 0:00 /bin/sh -c ps xua | grep osmo build 25301 0.0 0.0 11128 992 ? S 16:08 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 16:09:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 16:09:25 +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_#5750?= In-Reply-To: <1599284478.257.1537786872941.JavaMail.jenkins@jenkins.osmocom.org> References: <1599284478.257.1537786872941.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1617404591.262.1537805365114.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.09 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 2761 1.1 0.0 39744 14836 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2802 0.0 0.0 21474958428 11204 ? S 16:09 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg2z9pyb build 2809 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2811 0.0 0.0 11128 1028 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg2z9pyb, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg2z9pyb' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 2761 1.0 0.0 39744 14836 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2812 0.0 0.0 21474958428 11308 ? S 16:09 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg2z9pyb build 2819 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2821 0.0 0.0 11128 1028 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 2761 0.8 0.0 39744 14836 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2822 0.0 0.0 21475042604 19988 ? R 16:09 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2829 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2831 0.0 0.0 11128 1028 ? S 16:09 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgLnY9Rp, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgLnY9Rp' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 2761 0.7 0.0 39648 14828 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2832 0.0 0.0 21474976444 14712 ? D 16:09 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgLnY9Rp build 2839 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2841 0.0 0.0 11128 1028 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgLnY9Rp, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgLnY9Rp' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 2761 0.7 0.0 39648 14828 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2842 0.0 0.0 21475108768 30992 ? R 16:09 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgLnY9Rp build 2849 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2851 0.0 0.0 4336 100 ? R 16:09 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2761 0.6 0.0 39648 14828 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2852 1.0 0.0 21474962632 10992 ? S 16:09 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2859 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2861 0.0 0.0 11128 1028 ? R 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgjIBnCQ, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgjIBnCQ' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2761 0.6 0.0 39648 14828 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2862 0.0 0.0 21474962632 10984 ? S 16:09 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgjIBnCQ build 2869 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2871 0.0 0.0 4336 100 ? R 16:09 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgjIBnCQ, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgjIBnCQ' > ls -l /proc/2761/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[890513585] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[890513586] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[890513587] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2761 0.5 0.0 39648 14828 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2872 1.0 0.0 21474962632 11024 ? S 16:09 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgjIBnCQ build 2879 0.0 0.0 4336 728 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 2881 0.0 0.0 11128 1028 ? S 16:09 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 16:09:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 16:09:51 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5751?= In-Reply-To: <1703259488.261.1537805308982.JavaMail.jenkins@jenkins.osmocom.org> References: <1703259488.261.1537805308982.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <965214696.263.1537805391124.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 230.71 KB...] > 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:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 25186 1.1 0.0 39748 14840 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25227 0.0 0.0 21474958428 11520 ? S 16:09 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgkpgsMX build 25234 0.0 0.0 4336 816 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25236 0.0 0.0 11128 1052 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgkpgsMX, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgkpgsMX' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 25186 0.8 0.0 39748 14840 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25237 0.0 0.0 21474958428 11568 ? S 16:09 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgkpgsMX build 25244 0.0 0.0 4336 736 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25246 0.0 0.0 11128 944 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 25186 0.8 0.0 39748 14840 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25247 0.0 0.0 21475030184 16848 ? R 16:09 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25254 0.0 0.0 4336 760 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25256 0.0 0.0 4336 104 ? R 16:09 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgDgsqfl, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgDgsqfl' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 25186 0.8 0.0 39896 14984 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25257 0.0 0.0 21475030184 15500 ? R 16:09 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgDgsqfl build 25264 0.0 0.0 4336 760 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25266 0.0 0.0 11128 972 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgDgsqfl, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgDgsqfl' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 25186 0.7 0.0 39896 14984 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25267 0.0 0.0 21475030184 21552 ? R 16:09 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgDgsqfl build 25274 0.0 0.0 4336 764 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25276 0.0 0.0 11128 992 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 25186 0.6 0.0 39896 14984 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25277 0.0 0.0 21474956172 10868 ? S 16:09 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25284 0.0 0.0 4336 720 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25286 0.0 0.0 11128 948 ? S 16:09 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrCmGnl, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgrCmGnl' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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 > ps xua | grep osmo build 25186 0.6 0.0 39896 14984 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25287 0.0 0.0 21474956172 10840 ? S 16:09 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrCmGnl build 25294 0.0 0.0 4336 736 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25296 0.0 0.0 4336 108 ? R 16:09 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrCmGnl, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgrCmGnl' > ls -l /proc/25186/fd total 0 lr-x------ 1 build build 64 Sep 24 16:09 0 -> pipe:[1430937117] l-wx------ 1 build build 64 Sep 24 16:09 1 -> pipe:[1430937118] lr-x------ 1 build build 64 Sep 24 16:09 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:09 2 -> pipe:[1430937119] l-wx------ 1 build build 64 Sep 24 16:09 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25186 0.6 0.0 39896 14984 ? S 16:09 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25297 0.0 0.0 21474956172 10872 ? S 16:09 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrCmGnl build 25304 0.0 0.0 4336 764 ? S 16:09 0:00 /bin/sh -c ps xua | grep osmo build 25306 0.0 0.0 11128 944 ? S 16:09 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:696: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:785: 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 Mon Sep 24 16:09:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 16:09:54 +0000 Subject: Change in osmo-bts[master]: vty: mark 'rtp bind-ip' deprecated, not hidden Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11074 Change subject: vty: mark 'rtp bind-ip' deprecated, not hidden ...................................................................... vty: mark 'rtp bind-ip' deprecated, not hidden The command implementation says "deprecated", so then the vty command attribute should also be DEPRECATED. It will be hidden from online docs and vty reference. Change-Id: I23e620f1b947e129989fe69c6380c91b9abf7021 --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/11074/1 diff --git a/src/common/vty.c b/src/common/vty.c index 6061335..f918f57 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -464,7 +464,7 @@ #define RTP_STR "RTP parameters\n" -DEFUN_HIDDEN(cfg_bts_rtp_bind_ip, +DEFUN_DEPRECATED(cfg_bts_rtp_bind_ip, cfg_bts_rtp_bind_ip_cmd, "rtp bind-ip A.B.C.D", RTP_STR "RTP local bind IP Address\n" "RTP local bind IP Address\n") -- To view, visit https://gerrit.osmocom.org/11074 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: I23e620f1b947e129989fe69c6380c91b9abf7021 Gerrit-Change-Number: 11074 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 16:11:01 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 16:11:01 +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_#5751?= In-Reply-To: <1617404591.262.1537805365114.JavaMail.jenkins@jenkins.osmocom.org> References: <1617404591.262.1537805365114.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1950320201.264.1537805461343.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.01 MB...] > 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 > ps xua | grep osmo build 2917 1.0 0.0 39748 14852 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2958 0.0 0.0 21474958428 11452 ? S 16:10 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgoHl17M build 2965 0.0 0.0 4336 756 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 2967 0.0 0.0 11128 1008 ? S 16:10 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgoHl17M, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgoHl17M' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.7 0.0 39748 14852 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2968 0.0 0.0 21474958428 11404 ? S 16:10 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgoHl17M build 2975 0.0 0.0 4336 812 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 2977 0.0 0.0 11128 1028 ? S 16:10 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.7 0.0 39748 14852 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2978 0.0 0.0 21474976440 13720 ? R 16:10 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2985 0.0 0.0 4336 772 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 2987 0.0 0.0 11128 992 ? S 16:10 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg4cbc8z, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg4cbc8z' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.6 0.0 39908 15052 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2988 0.0 0.0 21474976440 13276 ? R 16:10 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg4cbc8z build 2995 0.0 0.0 4336 804 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 2997 0.0 0.0 11128 1000 ? S 16:10 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg4cbc8z, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg4cbc8z' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.5 0.0 39908 15052 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2998 0.0 0.0 21474976440 12132 ? R 16:10 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg4cbc8z build 3005 0.0 0.0 4336 720 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 3007 0.0 0.0 11128 996 ? S 16:10 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.5 0.0 39908 15052 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3008 0.0 0.0 21474962632 11080 ? S 16:10 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 3015 0.0 0.0 4336 724 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 3017 0.0 0.0 11128 1036 ? S 16:10 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrqI6L9, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgrqI6L9' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.5 0.0 39908 15052 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3018 0.0 0.0 21474962632 11156 ? S 16:10 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrqI6L9 build 3025 0.0 0.0 4336 768 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 3027 0.0 0.0 11128 1036 ? S 16:10 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrqI6L9, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgrqI6L9' > ls -l /proc/2917/fd total 0 lr-x------ 1 build build 64 Sep 24 16:10 0 -> pipe:[1430942764] l-wx------ 1 build build 64 Sep 24 16:10 1 -> pipe:[1430942765] lr-x------ 1 build build 64 Sep 24 16:10 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:10 2 -> pipe:[1430942766] l-wx------ 1 build build 64 Sep 24 16:10 3 -> /dev/null > 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 > ps xua | grep osmo build 2917 0.4 0.0 39908 15052 ? S 16:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 3028 0.0 0.0 21474962632 11156 ? S 16:10 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgrqI6L9 build 3035 0.0 0.0 4336 764 ? S 16:10 0:00 /bin/sh -c ps xua | grep osmo build 3037 0.0 0.0 11128 1004 ? S 16:10 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:785: 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 jenkins at lists.osmocom.org Mon Sep 24 16:18:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 16:18:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5752?= In-Reply-To: <965214696.263.1537805391124.JavaMail.jenkins@jenkins.osmocom.org> References: <965214696.263.1537805391124.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1672474694.265.1537805903342.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 250.17 KB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 25201 1.5 0.0 39744 14844 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25242 0.0 0.0 21474958428 11204 ? S 16:18 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgW_z3yK build 25249 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25251 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgW_z3yK, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgW_z3yK' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 25201 1.2 0.0 39744 14844 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25252 0.0 0.0 21474958428 11308 ? S 16:18 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgW_z3yK build 25259 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25261 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 25201 1.1 0.0 39744 14844 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25262 0.0 0.0 21474964020 12212 ? R 16:18 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 25269 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25271 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgs2dLKL, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgs2dLKL' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 25201 1.1 0.0 39744 14880 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25272 0.0 0.0 21474964020 10864 ? R 16:18 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgs2dLKL build 25279 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25281 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgs2dLKL, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgs2dLKL' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 25201 1.0 0.0 39744 14880 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25282 0.0 0.0 21474964024 13240 ? D 16:18 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgs2dLKL build 25289 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25291 0.0 0.0 4336 100 ? R 16:18 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25201 0.8 0.0 39744 14880 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25292 0.0 0.0 21474956172 10644 ? S 16:18 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 25299 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25301 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg61LT9X, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg61LT9X' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 25201 0.8 0.0 39744 14880 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25302 0.0 0.0 21474956172 10704 ? S 16:18 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg61LT9X build 25309 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25311 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg61LT9X, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg61LT9X' > ls -l /proc/25201/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[890928160] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[890928161] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[890928162] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 25201 0.7 0.0 39744 14880 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 25312 0.0 0.0 21474956172 10744 ? S 16:18 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg61LT9X build 25319 0.0 0.0 4336 728 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 25321 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: recipe for target 'check' failed make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Sep 24 16:18:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 16:18:29 +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_#5752?= In-Reply-To: <1950320201.264.1537805461343.JavaMail.jenkins@jenkins.osmocom.org> References: <1950320201.264.1537805461343.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <568835563.266.1537805909487.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.01 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 2689 0.8 0.0 39748 14896 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2730 0.0 0.0 21474958428 11496 ? S 16:18 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgTB9qGk build 2737 0.0 0.0 4336 724 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgTB9qGk, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgTB9qGk' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 2689 0.7 0.0 39748 14896 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2740 0.0 0.0 21474958428 11588 ? S 16:18 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgTB9qGk build 2747 0.0 0.0 4336 712 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2749 0.0 0.0 11128 1028 ? S 16:18 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 2689 0.6 0.0 39748 14896 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2750 0.0 0.0 21474976320 9404 ? R 16:18 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 2757 0.0 0.0 4336 772 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2759 0.0 0.0 11128 988 ? S 16:18 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg66Pxti, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg66Pxti' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 2689 0.6 0.0 39908 15096 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2760 0.0 0.0 21474976440 12436 ? R 16:18 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg66Pxti build 2767 0.0 0.0 4336 804 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2769 0.0 0.0 11128 960 ? S 16:18 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg66Pxti, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg66Pxti' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 2689 0.5 0.0 39908 15096 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2770 0.0 0.0 21474976440 12884 ? R 16:18 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg66Pxti build 2777 0.0 0.0 4336 748 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2779 0.0 0.0 11128 984 ? S 16:18 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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:4253 *:* > ps xua | grep osmo build 2689 0.5 0.0 39908 15096 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2780 0.0 0.0 21474962632 11004 ? S 16:18 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 2787 0.0 0.0 4336 748 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2789 0.0 0.0 4336 108 ? R 16:18 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgzZrTdu, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgzZrTdu' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 2689 0.5 0.0 39908 15096 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2790 0.0 0.0 21474962636 10832 ? R 16:18 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgzZrTdu build 2797 0.0 0.0 4336 812 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2799 0.0 0.0 4336 104 ? R 16:18 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgzZrTdu, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgzZrTdu' > ls -l /proc/2689/fd total 0 lr-x------ 1 build build 64 Sep 24 16:18 0 -> pipe:[1431158189] l-wx------ 1 build build 64 Sep 24 16:18 1 -> pipe:[1431158190] lr-x------ 1 build build 64 Sep 24 16:18 11 -> /dev/urandom l-wx------ 1 build build 64 Sep 24 16:18 2 -> pipe:[1431158191] l-wx------ 1 build build 64 Sep 24 16:18 3 -> /dev/null > 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 > ps xua | grep osmo build 2689 0.5 0.0 39908 15096 ? S 16:18 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 2800 0.0 0.0 21474962636 11016 ? D 16:18 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgzZrTdu build 2807 0.0 0.0 4336 744 ? S 16:18 0:00 /bin/sh -c ps xua | grep osmo build 2809 0.0 0.0 11128 1000 ? S 16:18 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:687: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 make[4]: *** [check-local] Error 2 Makefile:696: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:549: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:401: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:494: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:785: 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 Mon Sep 24 16:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 16:45:15 +0000 Subject: Change in osmo-sgsn[master]: vty: fix doc str for 'reset sgsn state' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11075 Change subject: vty: fix doc str for 'reset sgsn state' ...................................................................... vty: fix doc str for 'reset sgsn state' Document all keywords of the 'reset sgsn state' command: set the same doc string for all three. Also fixes the build after libosmocore I1f18e0e41da4772d092d71261b9e489dc1598923, which resulted in HIDDEN commands coming up in the VTY reference dumping. Note that libosmocore I92c3c66ff69c186234276c64478d6342e061d25e will again remove this breakage by omitting hidden commands. Change-Id: I8b6e8615e409266910f2f76a10ced9ab33e4de91 --- M src/gprs/sgsn_vty.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/75/11075/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 63985bc..87c6884 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -801,10 +801,14 @@ vty_out(vty, " Use count: %u%s", gsub->use_count, VTY_NEWLINE); } +#define RESET_SGSN_STATE_STR \ + "Remove all known subscribers, MM contexts and flush BSSGP queues." \ + " Useful only when running tests against the SGSN\n" + 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") + RESET_SGSN_STATE_STR RESET_SGSN_STATE_STR RESET_SGSN_STATE_STR) { struct gprs_subscr *subscr, *tmp_subscr; struct sgsn_mm_ctx *mm, *tmp_mm; -- To view, visit https://gerrit.osmocom.org/11075 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: I8b6e8615e409266910f2f76a10ced9ab33e4de91 Gerrit-Change-Number: 11075 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 16:48:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 16:48:01 +0000 Subject: Change in libosmocore[master]: vty: omit HIDDEN from vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11076 Change subject: vty: omit HIDDEN from vty reference ...................................................................... vty: omit HIDDEN from vty reference During 'show online help', the XML vty node dump, omit all commands marked HIDDEN. These commands were already hidden from the VTY reference prior to commit I1f18e0e41da4772d092d71261b9e489dc1598923, because of broken/confusing bit and boolean logic mixup. After this commit, HIDDEN commands end up in the doc. So practically, this brings back the status quo of before above commit, even though the previous code clearly "intended" to list HIDDEN commands in the reference. AFAICT the complete list of commands currently hidden is: * osmo-bsc: bts/"training_sequence_code <0-7>", * osmo-bsc: ts/"phys_chan_config PCHAN" for uppercase pchans; * osmo-bts: bts/"rtp bind-ip A.B.C.D" which actually says vty_out(vty, "%% rtp bind-ip is now deprecated%s", VTY_NEWLINE); * osmo-sgsn: 'reset sgsn state' used for SGSN testing. Note that the osmo-sgsn build was broken by including hidden commands in the vty reference, since one of its hidden commands had missing doc strings and made osmotestconfig.py signal failure. This would fix that from the hide-hidden-commands angle, and so would osmo-sgsn commit I8b6e8615e409266910f2f76a10ced9ab33e4de91 from the fix-the-doc-strings angle. Change-Id: I92c3c66ff69c186234276c64478d6342e061d25e --- M src/vty/command.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/11076/1 diff --git a/src/vty/command.c b/src/vty/command.c index 1e77d13..a540cd5 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -679,7 +679,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (!vty_command_is_common(elem)) continue; - if (!(elem->attr & CMD_ATTR_DEPRECATED)) + if (!(elem->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))) vty_dump_element(elem, vty); } } @@ -717,7 +717,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (vty_command_is_common(elem)) continue; - if (!(elem->attr & CMD_ATTR_DEPRECATED)) + if (!(elem->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))) vty_dump_element(elem, vty); } -- To view, visit https://gerrit.osmocom.org/11076 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: I92c3c66ff69c186234276c64478d6342e061d25e Gerrit-Change-Number: 11076 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 16:50:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 16:50:45 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Patch Set 1: Code-Review-1 ah, actually, I have a patch in the pipeline that drops the 'add' from the vty command, so let's wait for that first. The change id will be I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8 once it is pushed to gerrit. -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 24 Sep 2018 16:50: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 Sep 24 16:51:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 16:51:00 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 24 Sep 2018 16:51:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 16:53:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 16:53:36 +0000 Subject: Change in osmo-bts[master]: vty: mark 'rtp bind-ip' deprecated, not hidden In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11074 ) Change subject: vty: mark 'rtp bind-ip' deprecated, not hidden ...................................................................... Patch Set 1: wtf? make[3]: Entering directory '/home/osmocom-build/jenkins/workspace/gerrit-osmo-bts/BTS_MODEL/sysmo/FIRMWARE_VERSION/femtobts_v2.7/a3/default/a4/default/label/osmocom-gerrit-debian9/deps/libosmocore/src/gsm' 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 /bin/bash: line 2: 29554 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm48.lo -MD -MP -MF $depbase.Tpo -c -o gsm48.lo gsm48.c Makefile:591: recipe for target 'gsm48.lo' failed -- To view, visit https://gerrit.osmocom.org/11074 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: I23e620f1b947e129989fe69c6380c91b9abf7021 Gerrit-Change-Number: 11074 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 24 Sep 2018 16:53:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 24 17:03:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 24 Sep 2018 17:03:00 +0000 Subject: Change in libosmocore[master]: vty: omit HIDDEN from vty reference In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11076 to look at the new patch set (#2). Change subject: vty: omit HIDDEN from vty reference ...................................................................... vty: omit HIDDEN from vty reference During 'show online help', the XML vty node dump, omit all commands marked HIDDEN. These commands were already hidden from the VTY reference prior to commit I1f18e0e41da4772d092d71261b9e489dc1598923, because of broken/confusing bit and boolean logic mixup. After that commit, HIDDEN commands end up in the doc. So practically, this patch here brings back the status quo of before above commit, even though the previous code clearly "intended" to list HIDDEN commands in the reference but failed to have that effect. AFAICT the complete list of commands currently hidden is: * osmo-bsc: bts/"training_sequence_code <0-7>", * osmo-bsc: ts/"phys_chan_config PCHAN" for uppercase pchans; * osmo-bts: bts/"rtp bind-ip A.B.C.D" which actually says vty_out(vty, "%% rtp bind-ip is now deprecated%s", VTY_NEWLINE); * osmo-sgsn: 'reset sgsn state' used for SGSN testing. Note that the osmo-sgsn build was broken by including hidden commands in the vty reference, since one of its hidden commands had missing doc strings and made osmotestconfig.py signal failure. This would fix that from the hide-hidden-commands angle, and so would osmo-sgsn commit I8b6e8615e409266910f2f76a10ced9ab33e4de91 from the fix-the-doc-strings angle. Change-Id: I92c3c66ff69c186234276c64478d6342e061d25e --- M src/vty/command.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/11076/2 -- To view, visit https://gerrit.osmocom.org/11076 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: I92c3c66ff69c186234276c64478d6342e061d25e Gerrit-Change-Number: 11076 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 Sep 24 20:29:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 20:29:09 +0000 Subject: Change in libosmocore[master]: vty: omit HIDDEN from vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11076 ) Change subject: vty: omit HIDDEN from vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11076 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: I92c3c66ff69c186234276c64478d6342e061d25e Gerrit-Change-Number: 11076 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 24 Sep 2018 20:29: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 Sep 24 20:29:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 20:29:11 +0000 Subject: Change in libosmocore[master]: vty: omit HIDDEN from vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11076 ) Change subject: vty: omit HIDDEN from vty reference ...................................................................... vty: omit HIDDEN from vty reference During 'show online help', the XML vty node dump, omit all commands marked HIDDEN. These commands were already hidden from the VTY reference prior to commit I1f18e0e41da4772d092d71261b9e489dc1598923, because of broken/confusing bit and boolean logic mixup. After that commit, HIDDEN commands end up in the doc. So practically, this patch here brings back the status quo of before above commit, even though the previous code clearly "intended" to list HIDDEN commands in the reference but failed to have that effect. AFAICT the complete list of commands currently hidden is: * osmo-bsc: bts/"training_sequence_code <0-7>", * osmo-bsc: ts/"phys_chan_config PCHAN" for uppercase pchans; * osmo-bts: bts/"rtp bind-ip A.B.C.D" which actually says vty_out(vty, "%% rtp bind-ip is now deprecated%s", VTY_NEWLINE); * osmo-sgsn: 'reset sgsn state' used for SGSN testing. Note that the osmo-sgsn build was broken by including hidden commands in the vty reference, since one of its hidden commands had missing doc strings and made osmotestconfig.py signal failure. This would fix that from the hide-hidden-commands angle, and so would osmo-sgsn commit I8b6e8615e409266910f2f76a10ced9ab33e4de91 from the fix-the-doc-strings angle. Change-Id: I92c3c66ff69c186234276c64478d6342e061d25e --- M src/vty/command.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/command.c b/src/vty/command.c index 1e77d13..a540cd5 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -679,7 +679,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (!vty_command_is_common(elem)) continue; - if (!(elem->attr & CMD_ATTR_DEPRECATED)) + if (!(elem->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))) vty_dump_element(elem, vty); } } @@ -717,7 +717,7 @@ elem = vector_slot(cnode->cmd_vector, j); if (vty_command_is_common(elem)) continue; - if (!(elem->attr & CMD_ATTR_DEPRECATED)) + if (!(elem->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))) vty_dump_element(elem, vty); } -- To view, visit https://gerrit.osmocom.org/11076 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: I92c3c66ff69c186234276c64478d6342e061d25e Gerrit-Change-Number: 11076 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 Sep 24 20:30:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 20:30:11 +0000 Subject: Change in osmo-bts[master]: vty: mark 'rtp bind-ip' deprecated, not hidden In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11074 ) Change subject: vty: mark 'rtp bind-ip' deprecated, not hidden ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11074 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: I23e620f1b947e129989fe69c6380c91b9abf7021 Gerrit-Change-Number: 11074 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 24 Sep 2018 20:30: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 Sep 24 20:30:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 20:30:40 +0000 Subject: Change in osmo-sgsn[master]: vty: fix doc str for 'reset sgsn state' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11075 ) Change subject: vty: fix doc str for 'reset sgsn state' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11075 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: I8b6e8615e409266910f2f76a10ced9ab33e4de91 Gerrit-Change-Number: 11075 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 24 Sep 2018 20:30: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 Sep 24 20:30:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 20:30:41 +0000 Subject: Change in osmo-sgsn[master]: vty: fix doc str for 'reset sgsn state' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11075 ) Change subject: vty: fix doc str for 'reset sgsn state' ...................................................................... vty: fix doc str for 'reset sgsn state' Document all keywords of the 'reset sgsn state' command: set the same doc string for all three. Also fixes the build after libosmocore I1f18e0e41da4772d092d71261b9e489dc1598923, which resulted in HIDDEN commands coming up in the VTY reference dumping. Note that libosmocore I92c3c66ff69c186234276c64478d6342e061d25e will again remove this breakage by omitting hidden commands. Change-Id: I8b6e8615e409266910f2f76a10ced9ab33e4de91 --- M src/gprs/sgsn_vty.c 1 file changed, 5 insertions(+), 1 deletion(-) 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 63985bc..87c6884 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -801,10 +801,14 @@ vty_out(vty, " Use count: %u%s", gsub->use_count, VTY_NEWLINE); } +#define RESET_SGSN_STATE_STR \ + "Remove all known subscribers, MM contexts and flush BSSGP queues." \ + " Useful only when running tests against the SGSN\n" + 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") + RESET_SGSN_STATE_STR RESET_SGSN_STATE_STR RESET_SGSN_STATE_STR) { struct gprs_subscr *subscr, *tmp_subscr; struct sgsn_mm_ctx *mm, *tmp_mm; -- To view, visit https://gerrit.osmocom.org/11075 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: I8b6e8615e409266910f2f76a10ced9ab33e4de91 Gerrit-Change-Number: 11075 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 Sep 24 20:31:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 24 Sep 2018 20:31:26 +0000 Subject: Change in pysim[master]: utils: fix encoding/decoding of IMSI value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11073 ) Change subject: utils: fix encoding/decoding of IMSI value ...................................................................... Patch Set 1: Code-Review-1 please use git to correctly set GIT_AUTHOR_EMAIL / GIT_AUTHOR_NAME to have attribution correctly stored in git. -- To view, visit https://gerrit.osmocom.org/11073 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: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Gerrit-Change-Number: 11073 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 24 Sep 2018 20:31:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Sep 24 20:37:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 20:37: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_#5753?= In-Reply-To: <1672474694.265.1537805903342.JavaMail.jenkins@jenkins.osmocom.org> References: <1672474694.265.1537805903342.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <828484316.269.1537821467711.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Sep 24 20:38:56 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Sep 2018 20:38:56 +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_#5753?= In-Reply-To: <568835563.266.1537805909487.JavaMail.jenkins@jenkins.osmocom.org> References: <568835563.266.1537805909487.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1421171150.270.1537821536715.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Sep 25 08:04:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 08:04:19 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Add osmo-iuh builds In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11029 ) Change subject: jobs: osmo-gsm-tester: Add osmo-iuh builds ...................................................................... jobs: osmo-gsm-tester: Add osmo-iuh builds Change-Id: I7b8f51597287e7673f79c65eae2508b074151781 --- M jobs/osmo-gsm-tester-builder.yml M jobs/osmo-gsm-tester-runner.yml 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 748062d..1b522fc 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -11,6 +11,7 @@ - osmo-ggsn - osmo-hlr - osmo-mgw + - osmo-iuh - osmo-msc - osmo-pcu - osmo-sgsn @@ -81,6 +82,10 @@ - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_bsc - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_libasn1c + - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmo_iuh + - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_msc - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_hlr diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index f6774b7..a45d428 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -62,6 +62,8 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmo-mgw - copy_artifact: + repo: osmo-gsm-tester_build-osmo-iuh + - copy_artifact: repo: osmo-gsm-tester_build-osmo-msc - copy_artifact: repo: osmo-gsm-tester_build-osmo-pcu -- To view, visit https://gerrit.osmocom.org/11029 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: I7b8f51597287e7673f79c65eae2508b074151781 Gerrit-Change-Number: 11029 Gerrit-PatchSet: 3 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 Tue Sep 25 08:04:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 08:04:20 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11030 ) Change subject: jobs: osmo-gsm-tester: Copy osmocom-bb build artifact ...................................................................... jobs: osmo-gsm-tester: Copy osmocom-bb build artifact This artifact is not needed nowadays to run current tests in those jobs, since it is only used in osmo-gsm-tester_ttcn3, but it will eventually be used once we support virtphy and/or motorola phones in usual tests, and also because it's easier for developers to download full .tar.gz with all at once instead of having to download osmocom-bb one separately whn whilling to run ttcn3 testsuite locally. Change-Id: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index a45d428..8f7cd03 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -76,6 +76,8 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmo-stp - copy_artifact: + repo: osmo-gsm-tester_build-osmocom-bb + - copy_artifact: repo: osmo-gsm-tester_build-osmo-bts-sysmo - copy_artifact: repo: osmo-gsm-tester_build-osmo-pcu-sysmo -- To view, visit https://gerrit.osmocom.org/11030 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: I9fe41e2c7d9c38796ce16f2f279792bc5151b498 Gerrit-Change-Number: 11030 Gerrit-PatchSet: 3 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 Tue Sep 25 08:04:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 08:04:20 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verifica... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11038 ) Change subject: jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification ...................................................................... jobs: osmo-gsm-tester_run-gerrit: Update suites selected for verification Recently in osmo-gsm-tester some suite names were changed to have better unified naming. As a result, some of the suites used here need to updated. Change-Id: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a --- M jobs/osmo-gsm-tester_run-gerrit.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh b/jobs/osmo-gsm-tester_run-gerrit.sh index 6d33490..4f250be 100644 --- a/jobs/osmo-gsm-tester_run-gerrit.sh +++ b/jobs/osmo-gsm-tester_run-gerrit.sh @@ -10,5 +10,5 @@ unlink osmo-gsm-tester/example/resources.conf || true ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf -export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo" +export OSMO_GSM_TESTER_OPTS="-s nitb_sms:sysmo -s sms:sysmo -s gprs:sysmo" ./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh -- To view, visit https://gerrit.osmocom.org/11038 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: Iafe865ab5f607fc8acfcb3f72ebe4b0ef0f1322a Gerrit-Change-Number: 11038 Gerrit-PatchSet: 2 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 Tue Sep 25 09:31:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 09:31:40 +0000 Subject: Change in python/osmo-python-tests[master]: osmo-ctrl2cgi.service: Fix exec path not absolute Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11077 Change subject: osmo-ctrl2cgi.service: Fix exec path not absolute ...................................................................... osmo-ctrl2cgi.service: Fix exec path not absolute systemd errors due to executabl path not being absolute: systemd[1]: [/lib/systemd/system/osmo-ctrl2cgi.service:7] Executable path is not absolute, ignoring: python3 /usr/bin/ctrl2cgi.py systemd[1]: osmo-ctrl2cgi.service: Service lacks both ExecStart= and ExecStop= setting. Refusing. Change-Id: I8e3d695951fb36d53c112b6dce10a275b757ca5a --- M contrib/systemd/osmo-ctrl2cgi.service 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/77/11077/1 diff --git a/contrib/systemd/osmo-ctrl2cgi.service b/contrib/systemd/osmo-ctrl2cgi.service index 36ff78b..8563c66 100644 --- a/contrib/systemd/osmo-ctrl2cgi.service +++ b/contrib/systemd/osmo-ctrl2cgi.service @@ -4,7 +4,7 @@ [Service] Type=simple Restart=always -ExecStart=python3 /usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini +ExecStart=/usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini RestartSec=2 [Install] -- To view, visit https://gerrit.osmocom.org/11077 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: I8e3d695951fb36d53c112b6dce10a275b757ca5a Gerrit-Change-Number: 11077 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 Sep 25 09:41:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 09:41:09 +0000 Subject: Change in osmo-gsm-tester[master]: Optimize and re-use an existing repository In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11063 ) Change subject: Optimize and re-use an existing repository ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11063 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: I63f103b2f70559e969e8c66477ab9ee7f2886832 Gerrit-Change-Number: 11063 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 25 Sep 2018 09:41: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 Sep 25 09:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 09:46:04 +0000 Subject: Change in osmo-gsm-tester[master]: Package mobile and virtphy as part of osmocom-bb as well In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11064 ) Change subject: Package mobile and virtphy as part of osmocom-bb as well ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11064/1/contrib/jenkins-build-osmocom-bb.sh File contrib/jenkins-build-osmocom-bb.sh: https://gerrit.osmocom.org/#/c/11064/1/contrib/jenkins-build-osmocom-bb.sh at 10 PS1, Line 10: build_repo libosmocore --disable-doxygen We need to enable sanitize here too. -- To view, visit https://gerrit.osmocom.org/11064 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: Ie44dca72327e928073b00cde434d1cf2de574d9c Gerrit-Change-Number: 11064 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 25 Sep 2018 09:46:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 09:46:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 25 Sep 2018 09:46:25 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: don't use /tmp, better git code In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11053 ) Change subject: osmo-depcheck: don't use /tmp, better git code ...................................................................... Patch Set 1: (1 comment) pespin, neels: do you think this is ready to go? https://gerrit.osmocom.org/#/c/11053/1/scripts/osmo-depcheck/dependencies.py File scripts/osmo-depcheck/dependencies.py: https://gerrit.osmocom.org/#/c/11053/1/scripts/osmo-depcheck/dependencies.py at 46 PS1, Line 46: try: > This part probably belongs to a separate specific feature, and could easily go into a different patc [?] Understood, I will split up my patches more in the future. Is this alright if we keep it this time (as this is a pretty new CI script, not production code), or should I split this one up as well? -- To view, visit https://gerrit.osmocom.org/11053 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: I06589277b9d54a2af177451cfab2ca1a658b4058 Gerrit-Change-Number: 11053 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 25 Sep 2018 09:46:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 09:48:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 09:48:31 +0000 Subject: Change in osmo-gsm-tester[master]: Be able to switch-off ASAN builds of our binaries. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11065 ) Change subject: Be able to switch-off ASAN builds of our binaries. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11065 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: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c Gerrit-Change-Number: 11065 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 25 Sep 2018 09:48: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 Sep 25 09:49:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 25 Sep 2018 09:49:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contain... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10966 ) Change subject: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10966 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: Ia16a454e78421430ec32cc37939d429970cb06ec Gerrit-Change-Number: 10966 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 25 Sep 2018 09:49:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 09:50:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 09:50:15 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: don't use /tmp, better git code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11053 ) Change subject: osmo-depcheck: don't use /tmp, better git code ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11053/1/scripts/osmo-depcheck/dependencies.py File scripts/osmo-depcheck/dependencies.py: https://gerrit.osmocom.org/#/c/11053/1/scripts/osmo-depcheck/dependencies.py at 46 PS1, Line 46: try: > Understood, I will split up my patches more in the future. [?] Fine this time. -- To view, visit https://gerrit.osmocom.org/11053 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: I06589277b9d54a2af177451cfab2ca1a658b4058 Gerrit-Change-Number: 11053 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 25 Sep 2018 09:50: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 Sep 25 09:59:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 25 Sep 2018 09:59:05 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: don't use /tmp, better git code In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11053 ) Change subject: osmo-depcheck: don't use /tmp, better git code ...................................................................... osmo-depcheck: don't use /tmp, better git code * replace --gitdir with --workdir and give it a new folder structure: * git/$repo: downloaded source code * build/$repo: files created during the build process * install/: installation prefix * adjust the jenkins job to use --workdir * fetch --tags when source exists already * readable error message for failed git checkout Change-Id: I06589277b9d54a2af177451cfab2ca1a658b4058 Relates: OS#2642 --- M jobs/osmocom-depcheck.yml M scripts/osmo-depcheck/buildstack.py M scripts/osmo-depcheck/dependencies.py M scripts/osmo-depcheck/osmo-depcheck.py M scripts/osmo-depcheck/parse.py 5 files changed, 96 insertions(+), 68 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml index f13d4b7..fd2432e 100644 --- a/jobs/osmocom-depcheck.yml +++ b/jobs/osmocom-depcheck.yml @@ -52,13 +52,13 @@ # Build the arguments args="$PROJECTS" args="$args -j 5" - args="$args -g $PWD/DEPCHECK_GITDIR" + args="$args -w $PWD/DEPCHECK_WORKDIR" args="$args -u $GIT_URL_PREFIX" [ "$BUILD" = "true" ] && args="$args -b" [ "$PRINT_OLD_DEPENDS" = "true" ] && args="$args -o" # Run osmo-depcheck - mkdir DEPCHECK_GITDIR + mkdir DEPCHECK_WORKDIR export PYTHONUNBUFFERED=1 scripts/osmo-depcheck/osmo-depcheck.py $args scm: diff --git a/scripts/osmo-depcheck/buildstack.py b/scripts/osmo-depcheck/buildstack.py index 87210ab..0a9a011 100644 --- a/scripts/osmo-depcheck/buildstack.py +++ b/scripts/osmo-depcheck/buildstack.py @@ -70,29 +70,15 @@ print(" * " + program + ":" + version) -def temp_install_folder(): - """ Generate a temporary installation folder - - It will be used as configure prefix, so when running 'make install', - the files will get copied in there instead of "/usr/local/". The folder - will get removed when the script has finished. - - :returns: the path to the temporary folder """ - ret = tempfile.mkdtemp(prefix="depcheck_") - atexit.register(shutil.rmtree, ret) - print("Temporary install folder: " + ret) - return ret - - -def set_environment(jobs, tempdir): +def set_environment(jobs, prefix): """ Configure the environment variables before running configure, make etc. :param jobs: parallel build jobs (for make) - :param tempdir: temporary installation dir (see temp_install_folder()) + :param prefix: installation folder """ - # Add tempdir to PKG_CONFIG_PATH and LD_LIBRARY_PATH - extend = {"PKG_CONFIG_PATH": tempdir + "/lib/pkgconfig", - "LD_LIBRARY_PATH": tempdir + "/lib"} + # Add prefix to PKG_CONFIG_PATH and LD_LIBRARY_PATH + extend = {"PKG_CONFIG_PATH": prefix + "/lib/pkgconfig", + "LD_LIBRARY_PATH": prefix + "/lib"} for env_var, folder in extend.items(): old = os.environ[env_var] if env_var in os.environ else "" os.environ[env_var] = old + ":" + folder @@ -101,10 +87,10 @@ os.environ["JOBS"] = str(jobs) -def build(gitdir, jobs, stack): +def build(workdir, jobs, stack): """ Build one program with all its dependencies. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param jobs: parallel build jobs (for make) :param stack: the build stack as returned by generate() above @@ -122,18 +108,23 @@ anymore in case they decide to compile the code again manually from the source folder. """ # Prepare the install folder and environment - tempdir = temp_install_folder() - unitdir = tempdir + "/lib/systemd/system/" - set_environment(jobs, tempdir) + prefix = workdir + "/install" + unitdir = prefix + "/lib/systemd/system/" + set_environment(jobs, prefix) # Iterate over stack for program, version in stack.items(): print("Building " + program + ":" + version) - os.chdir(gitdir + "/" + program) + + # Create and enter the build folder + builddir = workdir + "/build/" + program + os.mkdir(builddir) + os.chdir(builddir) # Run the build commands - commands = [["autoreconf", "-fi"], - ["./configure", "--prefix", tempdir, + gitdir = workdir + "/git/" + program + commands = [["autoreconf", "-fi", gitdir], + [gitdir + "/configure", "--prefix", prefix, "--with-systemdsystemunitdir=" + unitdir], ["make", "clean"], ["make"], diff --git a/scripts/osmo-depcheck/dependencies.py b/scripts/osmo-depcheck/dependencies.py index 78cf4a0..9b5187d 100644 --- a/scripts/osmo-depcheck/dependencies.py +++ b/scripts/osmo-depcheck/dependencies.py @@ -10,37 +10,55 @@ import parse -def git_clone(gitdir, prefix, repository, version): +def git_clone(workdir, prefix, cache_git_fetch, repository, version): """ Clone a missing git repository and checkout a specific version tag. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param prefix: git url prefix (e.g. "git://git.osmocom.org/") + :param cache_git_fetch: list of repositories that have already been + fetched in this run of osmo-depcheck :param repository: Osmocom git repository name (e.g. "libosmo-abis") :param version: "master" or a version tag like "0.11.0" """ - # Clone when needed - if not os.path.exists(gitdir + "/" + repository): - url = prefix + repository - print("Cloning git repo: " + url) - try: - subprocess.run(["git", "-C", gitdir, "clone", "-q", url], + repodir = workdir + "/git/" + repository + if repository not in cache_git_fetch: + if os.path.exists(repodir): + # Fetch tags for existing source + print("Fetching tags...") + subprocess.run(["git", "-C", repodir, "fetch", "--tags", "-q"], check=True) - except subprocess.CalledProcessError: - print("NOTE: if '" + repository + "' is part of a git repository" - " with a different name, please add it to the mapping in" - " 'config.py' and try again.") - sys.exit(1) + else: + # Clone the source + url = prefix + repository + print("Cloning git repo: " + url) + try: + subprocess.run(["git", "-C", workdir + "/git", "clone", "-q", + url], check=True) + except subprocess.CalledProcessError: + print("NOTE: if '" + repository + "' is part of a git" + " repository with a different name, please add it to the" + " mapping in 'config.py' and try again.") + sys.exit(1) + + # Only fetch the same repository once per session + cache_git_fetch.append(repository) # Checkout the version tag - subprocess.run(["git", "-C", gitdir + "/" + repository, "checkout", - version, "-q"], check=True) + try: + subprocess.run(["git", "-C", repodir, "checkout", version, "-q"], + check=True) + except subprocess.CalledProcessError: + print("ERROR: git checkout failed! Invalid version specified?") + sys.exit(1) -def generate(gitdir, prefix, initial, rev): +def generate(workdir, prefix, cache_git_fetch, initial, rev): """ Generate the dependency graph of an Osmocom program by cloning the git repository, parsing the "configure.ac" file, and recursing. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param prefix: git url prefix (e.g. "git://git.osmocom.org/") + :param cache_git_fetch: list of repositories that have already been + fetched in this run of osmo-depcheck :param initial: the first program to look at (e.g. "osmo-bts") :param rev: the git revision to check out ("master", "0.1.0", ...) :returns: a dictionary like the following: @@ -65,8 +83,8 @@ # Add the programs dependencies to the stack print("Looking at " + program + ":" + version) - git_clone(gitdir, prefix, program, version) - depends = parse.configure_ac(gitdir, program) + git_clone(workdir, prefix, cache_git_fetch, program, version) + depends = parse.configure_ac(workdir, program) stack.update(depends) # Add the program to the ret @@ -86,28 +104,28 @@ print(" * " + program + ":" + version + " depends: " + str(depends)) -def git_latest_tag(gitdir, repository): +def git_latest_tag(workdir, repository): """ Get the last release string by asking git for the latest tag. - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param repository: Osmocom git repository name (e.g. "libosmo-abis") :returns: the latest git tag (e.g. "1.0.2") """ - dir = gitdir + "/" + repository + dir = workdir + "/git/" + repository complete = subprocess.run(["git", "-C", dir, "describe", "--abbrev=0", "master"], check=True, stdout=subprocess.PIPE) return complete.stdout.decode().rstrip() -def print_old(gitdir, depends): +def print_old(workdir, depends): """ Print dependencies tied to an old release tag - :param gitdir: folder to which the sources will be cloned + :param workdir: path to where all data (git, build, install) is stored :param depends: return value from generate() above """ print("Dependencies on old releases:") for program, data in depends.items(): for depend, version in data["depends"].items(): - latest = git_latest_tag(gitdir, depend) + latest = git_latest_tag(workdir, depend) if latest == version: continue print(" * " + program + ":" + data["version"] + " -> " + diff --git a/scripts/osmo-depcheck/osmo-depcheck.py b/scripts/osmo-depcheck/osmo-depcheck.py index 92c0ce6..7f701d6 100755 --- a/scripts/osmo-depcheck/osmo-depcheck.py +++ b/scripts/osmo-depcheck/osmo-depcheck.py @@ -4,6 +4,7 @@ import argparse import os +import shutil import sys # Same folder @@ -17,16 +18,16 @@ description = ("This script verifies that Osmocom programs really build" " with the dependency versions they claim to support in" " configure.ac. In order to do that, it clones the" - " dependency repositories if they don't exist in gitdir" + " dependency repositories if they don't exist in workdir" " already, and checks out the minimum version tag. This" " happens recursively for their dependencies as well.") parser = argparse.ArgumentParser(description=description) # Git sources folder - gitdir_default = os.path.expanduser("~") + "/code" - parser.add_argument("-g", "--gitdir", default=gitdir_default, + workdir_default = os.path.expanduser("~") + "/osmo-depcheck-work" + parser.add_argument("-w", "--workdir", default=workdir_default, help="folder to which the sources will be cloned" - " (default: " + gitdir_default + ")") + " (default: " + workdir_default + ")") # Build switch parser.add_argument("-b", "--build", action="store_true", @@ -55,17 +56,33 @@ " revision is 'master')", metavar="project[:revision]") - # Gitdir must exist + # Workdir must exist ret = parser.parse_args() - if not os.path.exists(ret.gitdir): - print("ERROR: gitdir does not exist: " + ret.gitdir) + if not os.path.exists(ret.workdir): + print("ERROR: workdir does not exist: " + ret.workdir) sys.exit(1) return ret +def workdir_prepare(workdir): + """ Delete old binaries and create the subfolders in workdir + :param workdir: path to where all data is stored """ + # Delete folders with binaries from previous runs + for subfolder in ("build", "install"): + full = workdir + "/" + subfolder + if os.path.exists(full): + shutil.rmtree(full) + + # Create all subfolders + for subfolder in ("build", "install", "git"): + os.makedirs(workdir + "/" + subfolder, exist_ok=True) + + def main(): - # Iterate over projects args = parse_arguments() + + # Iterate over projects + cache_git_fetch = [] for project_rev in args.projects_revs: # Split the git revision from the project name project = project_rev @@ -74,7 +91,9 @@ project, rev = project_rev.split(":", 1) # Clone and parse the repositories - depends = dependencies.generate(args.gitdir, args.prefix, project, rev) + workdir_prepare(args.workdir) + depends = dependencies.generate(args.workdir, args.prefix, + cache_git_fetch, project, rev) print("---") dependencies.print_dict(depends) stack = buildstack.generate(depends) @@ -84,12 +103,12 @@ # Old versions if args.old: print("---") - dependencies.print_old(args.gitdir, depends) + dependencies.print_old(args.workdir, depends) # Build if args.build: print("---") - buildstack.build(args.gitdir, args.jobs, stack) + buildstack.build(args.workdir, args.jobs, stack) # Success print("---") diff --git a/scripts/osmo-depcheck/parse.py b/scripts/osmo-depcheck/parse.py index c6297d6..06f932e 100644 --- a/scripts/osmo-depcheck/parse.py +++ b/scripts/osmo-depcheck/parse.py @@ -84,16 +84,16 @@ operator + "'") -def configure_ac(gitdir, repo): +def configure_ac(workdir, repo): """ Parse the PKG_CHECK_MODULES statements of a configure.ac file. - :param gitdir: parent folder of all locally cloned git repositories + :param workdir: path to where all data (git, build, install) is stored :param repo: the repository to look at (e.g. "osmo-bts") :returns: a dictionary like the following: {"libosmocore": "0.11.0", "libosmo-abis": "0.5.0"} """ # Read configure.ac - path = gitdir + "/" + repo + "/configure.ac" + path = workdir + "/git/" + repo + "/configure.ac" with open(path) as handle: lines = handle.readlines() -- To view, visit https://gerrit.osmocom.org/11053 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: I06589277b9d54a2af177451cfab2ca1a658b4058 Gerrit-Change-Number: 11053 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 10:20:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:20:54 +0000 Subject: Change in osmo-gsm-tester[master]: suites: encryption: Add test register_a5_3_authreq In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11010 ) Change subject: suites: encryption: Add test register_a5_3_authreq ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11010 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: I279e78e741b3ca841cb8508db40874f3c17b0785 Gerrit-Change-Number: 11010 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: Tue, 25 Sep 2018 10:20: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 Sep 25 10:20:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:20:58 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Use correct var to write repo name in git_hashes.txt In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11015 ) Change subject: contrib: Use correct var to write repo name in git_hashes.txt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11015 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: I7a7db7cf4cc020295d216c60d6dc688f110916dc Gerrit-Change-Number: 11015 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: Tue, 25 Sep 2018 10: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 Tue Sep 25 10:21:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:21:00 +0000 Subject: Change in osmo-gsm-tester[master]: suites: encryption: Add test register_a5_3_authreq In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11010 ) Change subject: suites: encryption: Add test register_a5_3_authreq ...................................................................... suites: encryption: Add test register_a5_3_authreq Change-Id: I279e78e741b3ca841cb8508db40874f3c17b0785 --- A suites/encryption/register_a5_3_authreq.py 1 file changed, 8 insertions(+), 0 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/suites/encryption/register_a5_3_authreq.py b/suites/encryption/register_a5_3_authreq.py new file mode 100755 index 0000000..219c109 --- /dev/null +++ b/suites/encryption/register_a5_3_authreq.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import encryption_test_setup_run + +encryption_test_setup_run(True, 'a5_3') -- To view, visit https://gerrit.osmocom.org/11010 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: I279e78e741b3ca841cb8508db40874f3c17b0785 Gerrit-Change-Number: 11010 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 Tue Sep 25 10:21:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:21:01 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Use correct var to write repo name in git_hashes.txt In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11015 ) Change subject: contrib: Use correct var to write repo name in git_hashes.txt ...................................................................... contrib: Use correct var to write repo name in git_hashes.txt We want to write repo name in there, not $dep which actually doesn't exist in local context of have_repo function. In most cases it's actually the same because in almost all cases $dep is passed as $1 to have_repo and thus is the same as local $repo. But in a few recipes which don't use build_repo directly but instead use have_repo and build manually, $dep may not point to $repo. That's the case for osmocom-bb for instance. As a result, "libosmocore" is printed twice, were second word should be "osmocom-bb". Change-Id: I7a7db7cf4cc020295d216c60d6dc688f110916dc --- M contrib/jenkins-build-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) 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/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index c2ffbb4..bfe8d73 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -92,7 +92,7 @@ git rev-parse HEAD - echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt" + echo "$(git rev-parse HEAD) $repo" >> "$prefix_real/${name}_git_hashes.txt" cd "$base" } -- To view, visit https://gerrit.osmocom.org/11015 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: I7a7db7cf4cc020295d216c60d6dc688f110916dc Gerrit-Change-Number: 11015 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 Tue Sep 25 10:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:21:22 +0000 Subject: Change in osmo-gsm-tester[master]: Add dynts suite to test switch between PDCH and TCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11052 ) Change subject: Add dynts suite to test switch between PDCH and TCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11052 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: I73b51c31309ac4c28c64ed7eb7c8c649e535aa22 Gerrit-Change-Number: 11052 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 25 Sep 2018 10:21: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 Sep 25 10:21:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:21:24 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Add empty lines to easily spot different sections In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11054 ) Change subject: default-suites.conf: Add empty lines to easily spot different sections ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11054 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: If33fa9be091113d57b25dc3d73e277bbb3b0ce5a Gerrit-Change-Number: 11054 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 25 Sep 2018 10: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 Tue Sep 25 10:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:21:25 +0000 Subject: Change in osmo-gsm-tester[master]: Add dynts suite to test switch between PDCH and TCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11052 ) Change subject: Add dynts suite to test switch between PDCH and TCH ...................................................................... Add dynts suite to test switch between PDCH and TCH It seems for not yet clear reasons the MS require some time after the PDCH channels have been activated again to use them reliably. If no sleep is used between call hangup and gprs activate pdp ctx, the MS fails to activate the pdp ctx due to QMI error respone to the "Start network" requested. Related: OS#2582 Change-Id: I73b51c31309ac4c28c64ed7eb7c8c649e535aa22 --- M example/default-suites.conf A example/scenarios/mod-bts0-dynts67-ipa.conf A example/scenarios/mod-bts0-dynts67-osmo.conf A suites/dynts/suite.conf A suites/dynts/switch_tch_pdch.py 5 files changed, 142 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 1857ba5..74f54a2 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -12,6 +12,8 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo +- dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 - nitb_sms:trx-b200 - sms:trx-b200 - nitb_ussd:trx-b200 @@ -26,6 +28,8 @@ - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 - nitb_ussd:trx-sysmocell5000 @@ -40,6 +44,8 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo +- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 @@ -51,6 +57,7 @@ - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 @@ -63,6 +70,7 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - nitb_smpp - smpp - encryption diff --git a/example/scenarios/mod-bts0-dynts67-ipa.conf b/example/scenarios/mod-bts0-dynts67-ipa.conf new file mode 100644 index 0000000..087b3b0 --- /dev/null +++ b/example/scenarios/mod-bts0-dynts67-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: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' diff --git a/example/scenarios/mod-bts0-dynts67-osmo.conf b/example/scenarios/mod-bts0-dynts67-osmo.conf new file mode 100644 index 0000000..3153120 --- /dev/null +++ b/example/scenarios/mod-bts0-dynts67-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: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' diff --git a/suites/dynts/suite.conf b/suites/dynts/suite.conf new file mode 100644 index 0000000..3b32480 --- /dev/null +++ b/suites/dynts/suite.conf @@ -0,0 +1,10 @@ +resources: + ip_address: + - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + bts: + - times: 1 + modem: + - times: 2 + features: + - gprs + - voice diff --git a/suites/dynts/switch_tch_pdch.py b/suites/dynts/switch_tch_pdch.py new file mode 100755 index 0000000..f0bbd38 --- /dev/null +++ b/suites/dynts/switch_tch_pdch.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + + +def activate_pdp(ms_mo, ms_mt): + # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) + ctx_id_v4_mo = ms_mo.activate_context(apn='inet46', protocol=ms_mo.CTX_PROT_IPv4) + print('ms_mo pdp ctx %r activated' % repr(ctx_id_v4_mo)) + ctx_id_v4_mt = ms_mt.activate_context(apn='inet46', protocol=ms_mt.CTX_PROT_IPv4) + print('ms_mt pdp ctx %r activated' % repr(ctx_id_v4_mt)) + sleep(5) + ms_mo.deactivate_context(ctx_id_v4_mo) + ms_mt.deactivate_context(ctx_id_v4_mt) + +def make_call(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_mo.call_hangup(mo_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') + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms_mo = suite.modem() +ms_mt = suite.modem() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) + +ms_mo.connect(msc.mcc_mnc()) +ms_mt.connect(msc.mcc_mnc()) +ms_mo.attach() +ms_mt.attach() + +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) +wait(msc.subscriber_attached, ms_mt) + +print('waiting for modems to attach to data services...') +wait(ms_mo.is_attached) +wait(ms_mt.is_attached) + +print('1: activate_pdp') +activate_pdp(ms_mo, ms_mt) +print('2: make_call') +make_call(ms_mo, ms_mt) +print('3: Wait 30 seconds to let PCU handle the PDCH channels again') +sleep(30) +print('3: activate_pdp') +activate_pdp(ms_mo, ms_mt) +print('4: make_call') +make_call(ms_mo, ms_mt) +print('Done!') -- To view, visit https://gerrit.osmocom.org/11052 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: I73b51c31309ac4c28c64ed7eb7c8c649e535aa22 Gerrit-Change-Number: 11052 Gerrit-PatchSet: 2 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 Tue Sep 25 10:21:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 10:21:26 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Add empty lines to easily spot different sections In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11054 ) Change subject: default-suites.conf: Add empty lines to easily spot different sections ...................................................................... default-suites.conf: Add empty lines to easily spot different sections Change-Id: If33fa9be091113d57b25dc3d73e277bbb3b0ce5a --- M example/default-suites.conf 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 74f54a2..14e30d4 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -14,6 +14,7 @@ - gprs:sysmo+mod-bts0-dynts-osmo - dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:sysmo+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 + - nitb_sms:trx-b200 - sms:trx-b200 - nitb_ussd:trx-b200 @@ -30,6 +31,7 @@ - gprs:trx-b200+mod-bts0-dynts-osmo - dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 + - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 - nitb_ussd:trx-sysmocell5000 @@ -46,6 +48,7 @@ - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo - dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 + - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 @@ -58,6 +61,7 @@ - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa - dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 + - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 @@ -71,6 +75,7 @@ - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 + - nitb_smpp - smpp - encryption -- To view, visit https://gerrit.osmocom.org/11054 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: If33fa9be091113d57b25dc3d73e277bbb3b0ce5a Gerrit-Change-Number: 11054 Gerrit-PatchSet: 2 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 Tue Sep 25 11:12:57 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 25 Sep 2018 11:12:57 +0000 Subject: Change in libosmocore[master]: gsm_utils: add function to get value strings for gsm48_chan_mode Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11078 Change subject: gsm_utils: add function to get value strings for gsm48_chan_mode ...................................................................... gsm_utils: add function to get value strings for gsm48_chan_mode The enum gsm48_chan_mode has value strings, but no function to retrieve those strings. Lets add one. Change-Id: If715705e1ebdfcfdfae1c2099932f7bb8b3861a7 --- M include/osmocom/gsm/gsm_utils.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/11078/1 diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6ff4459..7eda5b9 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -228,6 +228,8 @@ }; extern const struct value_string gsm_chan_t_names[]; +static inline const char *gsm_chan_t_name(enum gsm48_chan_mode val) +{ return get_value_string(gsm_chan_t_names, val); } /* Deprectated functions */ /* Limit encoding and decoding to use no more than this amount of buffer bytes */ -- To view, visit https://gerrit.osmocom.org/11078 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: If715705e1ebdfcfdfae1c2099932f7bb8b3861a7 Gerrit-Change-Number: 11078 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 12:09:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 25 Sep 2018 12:09:36 +0000 Subject: Change in osmo-gsm-manuals[master]: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11079 Change subject: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC ...................................................................... osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC Change-Id: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c --- M OsmoSIPConnector/chapters/configuration.adoc 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/79/11079/1 diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc index 0a9a51f..5d7356c 100644 --- a/OsmoSIPConnector/chapters/configuration.adoc +++ b/OsmoSIPConnector/chapters/configuration.adoc @@ -11,6 +11,10 @@ OsmoSIPConnector need to be running on the same machine or have a shared directory that supports UNIX domain sockets. +Note that you need to start `osmo-msc` with the `--mncc-sock` option and point +to the same file that osmo-sip-connector is configured to use. See the OsmoMSC +manual for more information. + The example config below assumes that OsmoMSC was started with the command line `osmo-msc -M /tmp/msc_mncc`. -- To view, visit https://gerrit.osmocom.org/11079 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: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c Gerrit-Change-Number: 11079 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 12:09:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 25 Sep 2018 12:09:36 +0000 Subject: Change in osmo-gsm-manuals[master]: Add OsmoSIPConnector to master make file Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11080 Change subject: Add OsmoSIPConnector to master make file ...................................................................... Add OsmoSIPConnector to master make file Change-Id: Icdb405abfa560846f1ebb848f8d8dd34610cfc89 --- M Makefile 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/80/11080/1 diff --git a/Makefile b/Makefile index 4e821f5..0ef0942 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ cd OsmoGSMTester; $(MAKE) cd OsmoMSC; $(MAKE) cd OsmoHLR; $(MAKE) + cd OsmoSIPConnector; $(MAKE) cd OsmoSTP; $(MAKE) cd OsmocomBB; $(MAKE) cd OsmoMGW; $(MAKE) @@ -29,6 +30,7 @@ cd OsmoGSMTester; $(MAKE) clean cd OsmoMSC; $(MAKE) clean cd OsmoHLR; $(MAKE) clean + cd OsmoSIPConnector; $(MAKE) clean cd OsmoSTP; $(MAKE) clean cd OsmocomBB; $(MAKE) clean cd OsmoMGW; $(MAKE) clean @@ -46,6 +48,7 @@ cd OsmoGSMTester; $(MAKE) upload cd OsmoMSC; $(MAKE) upload cd OsmoHLR; $(MAKE) upload + cd OsmoSIPConnector; $(MAKE) upload cd OsmoSTP; $(MAKE) upload cd OsmocomBB; $(MAKE) upload cd OsmoMGW; $(MAKE) upload @@ -66,6 +69,7 @@ cd OsmoGSMTester; $(MAKE) check cd OsmoMSC; $(MAKE) check cd OsmoHLR; $(MAKE) check + cd OsmoSIPConnector; $(MAKE) check cd OsmoSTP; $(MAKE) check cd OsmocomBB; $(MAKE) check cd OsmoTRX; $(MAKE) check -- To view, visit https://gerrit.osmocom.org/11080 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: Icdb405abfa560846f1ebb848f8d8dd34610cfc89 Gerrit-Change-Number: 11080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 12:17:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 25 Sep 2018 12:17:22 +0000 Subject: Change in osmo-gsm-manuals[master]: Add OsmoSIPConnector to master make file In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11080 ) Change subject: Add OsmoSIPConnector to master make file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11080 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: Icdb405abfa560846f1ebb848f8d8dd34610cfc89 Gerrit-Change-Number: 11080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 25 Sep 2018 12:17: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 Sep 25 12:18:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 25 Sep 2018 12:18:02 +0000 Subject: Change in osmo-gsm-manuals[master]: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11079 ) Change subject: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11079 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: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c Gerrit-Change-Number: 11079 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 25 Sep 2018 12:18: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 Sep 25 12:18:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 25 Sep 2018 12:18:08 +0000 Subject: Change in osmo-gsm-manuals[master]: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11079 ) Change subject: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC ...................................................................... osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC Change-Id: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c --- M OsmoSIPConnector/chapters/configuration.adoc 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc index 24ac3a5..5cd57fa 100644 --- a/OsmoSIPConnector/chapters/configuration.adoc +++ b/OsmoSIPConnector/chapters/configuration.adoc @@ -11,6 +11,10 @@ OsmoSIPConnector need to be running on the same machine or have a shared directory that supports UNIX domain sockets. +Note that you need to start `osmo-msc` with the `--mncc-sock` option and point +to the same file that osmo-sip-connector is configured to use. See the OsmoMSC +manual for more information. + The example config below assumes that OsmoMSC was started with the command line `osmo-msc -M /tmp/msc_mncc`. -- To view, visit https://gerrit.osmocom.org/11079 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: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c Gerrit-Change-Number: 11079 Gerrit-PatchSet: 2 Gerrit-Owner: daniel 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 Sep 25 12:18:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 25 Sep 2018 12:18:09 +0000 Subject: Change in osmo-gsm-manuals[master]: Add OsmoSIPConnector to master make file In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11080 ) Change subject: Add OsmoSIPConnector to master make file ...................................................................... Add OsmoSIPConnector to master make file Change-Id: Icdb405abfa560846f1ebb848f8d8dd34610cfc89 --- M Makefile 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile b/Makefile index 4e821f5..0ef0942 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ cd OsmoGSMTester; $(MAKE) cd OsmoMSC; $(MAKE) cd OsmoHLR; $(MAKE) + cd OsmoSIPConnector; $(MAKE) cd OsmoSTP; $(MAKE) cd OsmocomBB; $(MAKE) cd OsmoMGW; $(MAKE) @@ -29,6 +30,7 @@ cd OsmoGSMTester; $(MAKE) clean cd OsmoMSC; $(MAKE) clean cd OsmoHLR; $(MAKE) clean + cd OsmoSIPConnector; $(MAKE) clean cd OsmoSTP; $(MAKE) clean cd OsmocomBB; $(MAKE) clean cd OsmoMGW; $(MAKE) clean @@ -46,6 +48,7 @@ cd OsmoGSMTester; $(MAKE) upload cd OsmoMSC; $(MAKE) upload cd OsmoHLR; $(MAKE) upload + cd OsmoSIPConnector; $(MAKE) upload cd OsmoSTP; $(MAKE) upload cd OsmocomBB; $(MAKE) upload cd OsmoMGW; $(MAKE) upload @@ -66,6 +69,7 @@ cd OsmoGSMTester; $(MAKE) check cd OsmoMSC; $(MAKE) check cd OsmoHLR; $(MAKE) check + cd OsmoSIPConnector; $(MAKE) check cd OsmoSTP; $(MAKE) check cd OsmocomBB; $(MAKE) check cd OsmoTRX; $(MAKE) check -- To view, visit https://gerrit.osmocom.org/11080 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: Icdb405abfa560846f1ebb848f8d8dd34610cfc89 Gerrit-Change-Number: 11080 Gerrit-PatchSet: 2 Gerrit-Owner: daniel 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 Sep 25 12:39:29 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 25 Sep 2018 12:39:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11081 Change subject: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm ...................................................................... MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm Change-Id: I25578c050b7e105ed71b064891d4cd418ee30fcf --- M library/BSSMAP_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/11081/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index a3a50de..70db2ec 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -885,6 +885,17 @@ } } +template PDU_BSSAP tr_BSSMAP_ClassmarkReq modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + classmarkRequest := { + messageType := '58'O, + talkerPriority := * + } + } + } +} + template BSSMAP_IE_ClassmarkInformationType2 ts_CM2_default := { elementIdentifier := '12'O, lengthIndicator := 0, /* overwritten */ diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 4bdbc1d..93d7c77 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1602,6 +1602,10 @@ } f_mm_auth(); alt { + [] BSSAP.receive(tr_BSSMAP_ClassmarkReq) { + BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + repeat; + } [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { f_expect_clear(); } -- To view, visit https://gerrit.osmocom.org/11081 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: I25578c050b7e105ed71b064891d4cd418ee30fcf Gerrit-Change-Number: 11081 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 12:45:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 25 Sep 2018 12:45:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2) to the change originally created by daniel. ( https://gerrit.osmocom.org/11081 ) Change subject: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm ...................................................................... MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm After osmo-msc I73c7cb6a86624695bd9c0f59abb72e2fdc655131, osmo-msc sends a BSSMAP Classmark Request if encounters a missing Classmark, which is the case during LU when A5/3 is enabled. Fix this test by answering the Classmark Request, if any. Change-Id: I25578c050b7e105ed71b064891d4cd418ee30fcf --- M library/BSSMAP_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/11081/2 -- To view, visit https://gerrit.osmocom.org/11081 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: I25578c050b7e105ed71b064891d4cd418ee30fcf Gerrit-Change-Number: 11081 Gerrit-PatchSet: 2 Gerrit-Owner: daniel 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 Sep 25 12:45:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 25 Sep 2018 12:45:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11081 ) Change subject: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11081 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: I25578c050b7e105ed71b064891d4cd418ee30fcf Gerrit-Change-Number: 11081 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 25 Sep 2018 12:45: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 Sep 25 14:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 25 Sep 2018 14:19:41 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert AMR S15-S0 to gsm0408 settings Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11082 Change subject: gsm0808: add function to convert AMR S15-S0 to gsm0408 settings ...................................................................... gsm0808: add function to convert AMR S15-S0 to gsm0408 settings Add a function to convert S0-S15 bits to struct gsm48_multi_rate_conf, which hold the codec settings for AMR. Change-Id: I973736273c236eee84decf15868190e339c3fed4 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 233 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/11082/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 8746ceb..f70dbdb 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -105,6 +105,7 @@ int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr); +void gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, uint16_t s15_s0); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 0d6938e..886f546 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1204,6 +1204,47 @@ return s15_s0; } +/*! Determine a GSM 04.08 AMR configuration struct from a set of speech codec + * configuration bits (S0-S15) + * \param[out] cfg AMR configuration in GSM 04.08 format. + * \param[in] s15_s0 configuration bits (S0-S15). */ +void gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, + uint16_t s15_s0) +{ + memset(cfg, 0, sizeof(*cfg)); + + /* Strip option bits */ + s15_s0 &= 0x00ff; + + /* Rate 5,15k must always be present */ + cfg->m5_15 = 1; + + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_4_75 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_4_75 & 0xff)) + cfg->m4_75 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_5_90 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_5_90 & 0xff)) + cfg->m5_90 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_6_70 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_6_70 & 0xff)) + cfg->m6_70 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_7_40 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_7_40 & 0xff)) + cfg->m7_40 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_7_95 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_7_95 & 0xff)) + cfg->m7_95 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_10_2 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_10_2 & 0xff)) + cfg->m10_2 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_12_2 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_12_2 & 0xff)) + cfg->m12_2 = 1; + + cfg->ver = 1; + cfg->icmi = 1; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3d08232..dcc491d 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -206,6 +206,7 @@ gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; gsm0808_sc_cfg_from_gsm48_mr_cfg; +gsm48_mr_cfg_from_gsm0808_sc_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 6faa689..8cf1cf4 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1640,6 +1640,62 @@ test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); } +static void test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single(uint16_t s15_s0) +{ + struct gsm48_multi_rate_conf cfg; + + printf("Input:\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + gsm48_mr_cfg_from_gsm0808_sc_cfg(&cfg, s15_s0); + + printf("Output:\n"); + printf(" m4_75= %u smod= %u\n", cfg.m4_75, cfg.smod); + printf(" m5_15= %u spare= %u\n", cfg.m5_15, cfg.spare); + printf(" m5_90= %u icmi= %u\n", cfg.m5_90, cfg.icmi); + printf(" m6_70= %u nscb= %u\n", cfg.m6_70, cfg.nscb); + printf(" m7_40= %u ver= %u\n", cfg.m7_40, cfg.ver); + printf(" m7_95= %u\n", cfg.m7_95); + printf(" m10_2= %u\n", cfg.m10_2); + printf(" m12_2= %u\n", cfg.m12_2); + + printf("\n"); +} + +void test_gsm48_mr_cfg_from_gsm0808_sc_cfg() +{ + printf("Testing gsm48_mr_cfg_from_gsm0808_sc_cfg():\n"); + + /* Only one codec per setting */ + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_4_75); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_5_15); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_5_90); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_6_70); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_7_40); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_7_95); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_10_2); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_12_2); + + /* Combinations */ + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_4_75 | GSM0808_SC_CFG_DEFAULT_AMR_6_70 | + GSM0808_SC_CFG_DEFAULT_AMR_10_2); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_10_2 | GSM0808_SC_CFG_DEFAULT_AMR_12_2 | + GSM0808_SC_CFG_DEFAULT_AMR_7_40); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_7_95 | GSM0808_SC_CFG_DEFAULT_AMR_12_2); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1692,6 +1748,7 @@ test_gsm0808_enc_dec_cell_id_global(); test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg(); printf("Done\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index dc1deba..58bc509 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -299,4 +299,137 @@ Result (hr): S15-S0 = 073f = 0b0000011100111111 +Testing gsm48_mr_cfg_from_gsm0808_sc_cfg(): +Input: + S15-S0 = ff03 = 0b1111111100000011 +Output: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 0000 = 0b0000000000000000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = ff06 = 0b1111111100000110 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 3e08 = 0b0011111000001000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 0c12 = 0b0000110000010010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = c020 = 0b1100000000100000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 1 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 3040 = 0b0011000001000000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 1 + m12_2= 0 + +Input: + S15-S0 = c082 = 0b1100000010000010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 1 + +Input: + S15-S0 = ff4b = 0b1111111101001011 +Output: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 1 + m12_2= 0 + +Input: + S15-S0 = fcd2 = 0b1111110011010010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 1 + m7_95= 0 + m10_2= 1 + m12_2= 1 + +Input: + S15-S0 = c0a2 = 0b1100000010100010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 1 + m10_2= 0 + m12_2= 1 + Done -- To view, visit https://gerrit.osmocom.org/11082 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: I973736273c236eee84decf15868190e339c3fed4 Gerrit-Change-Number: 11082 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 14:26:53 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 25 Sep 2018 14:26:53 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT 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/11060 to look at the new patch set (#6). Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (choosen) configuration bits with the assignment complete message. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Delends: libosmocore I973736273c236eee84decf15868190e339c3fed4 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 10 files changed, 145 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/6 -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 6 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 Sep 25 14:38:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 25 Sep 2018 14:38:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Don't expect specific ms_power_lvl when running without trxcon Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11083 Change subject: bts: Don't expect specific ms_power_lvl when running without trxcon ...................................................................... bts: Don't expect specific ms_power_lvl when running without trxcon When we don't use trxcon (ie we run real HW) we cannot set some parameters like ms power level, so we need to relax template matching when we receive UL measurements in that case. This commit makes tests TC_meas_res_sign_tchf and TC_meas_res_sign_tchh_toa256 pass with motorola CXX and osmo-trx+osmo-bts-trx. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11083/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index aa402d1..a5992f7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1239,6 +1239,15 @@ return ret; } +/* return a template expecting specific value only when using trxc */ +private function f_expect_with_trxc(integer val) return template integer { + var template integer ret := ?; + if (mp_bb_trxc_port != -1) { + ret := val; + } + return ret; +} + /* build a template for matching measurement results against */ private function f_build_meas_res_tmpl() runs on ConnHdlr return template RSL_Message { @@ -1258,7 +1267,7 @@ if (l1p.toa256_enabled) { ul_meas.len := (3+8); ul_meas.supp_meas_info := { - toa256_mean := l1p.timing_offset_256syms, + toa256_mean := f_expect_with_trxc(l1p.timing_offset_256syms), toa256_min := ?, toa256_max := ?, toa256_std_dev := ? @@ -1276,13 +1285,16 @@ power_level := l1p.bs_power_level }; var template RSL_IE_L1Info l1_info := { - ms_power_lvl := l1p.ms_power_level, + ms_power_lvl := f_expect_with_trxc(l1p.ms_power_level), fpc := false, reserved := 0, - actual_ta := l1p.ms_actual_ta + actual_ta := f_expect_with_trxc(l1p.ms_actual_ta) }; - var uint8_t offs := toffs256s_to_rsl(l1p.timing_offset_256syms); - var template uint8_t t_toffs := (offs-1 .. offs+1); /* some tolerance */ + var template uint8_t t_toffs := ?; + if (mp_bb_trxc_port != -1) { + var uint8_t offs := toffs256s_to_rsl(l1p.timing_offset_256syms); + t_toffs := (offs-1 .. offs+1); /* some tolerance */ + } return tr_RSL_MEAS_RES_OSMO(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power, l1_info, ?, t_toffs); } -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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 Sep 25 14:58:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 25 Sep 2018 14:58:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11081 ) Change subject: MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm ...................................................................... MSC_Tests: Reply to Classmark Req in TC_lu_imsi_auth_tmsi_encr_3_1_no_cm After osmo-msc I73c7cb6a86624695bd9c0f59abb72e2fdc655131, osmo-msc sends a BSSMAP Classmark Request if encounters a missing Classmark, which is the case during LU when A5/3 is enabled. Fix this test by answering the Classmark Request, if any. Change-Id: I25578c050b7e105ed71b064891d4cd418ee30fcf --- M library/BSSMAP_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 15 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index a3a50de..70db2ec 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -885,6 +885,17 @@ } } +template PDU_BSSAP tr_BSSMAP_ClassmarkReq modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + classmarkRequest := { + messageType := '58'O, + talkerPriority := * + } + } + } +} + template BSSMAP_IE_ClassmarkInformationType2 ts_CM2_default := { elementIdentifier := '12'O, lengthIndicator := 0, /* overwritten */ diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 4bdbc1d..93d7c77 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1602,6 +1602,10 @@ } f_mm_auth(); alt { + [] BSSAP.receive(tr_BSSMAP_ClassmarkReq) { + BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + repeat; + } [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { f_expect_clear(); } -- To view, visit https://gerrit.osmocom.org/11081 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: I25578c050b7e105ed71b064891d4cd418ee30fcf Gerrit-Change-Number: 11081 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Sep 25 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 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_#257?= In-Reply-To: <1229592520.260.1537801806577.JavaMail.jenkins@jenkins.osmocom.org> References: <1229592520.260.1537801806577.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <65494795.284.1537888206748.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 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_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 -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 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_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 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 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 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_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 Tue Sep 25 15:31:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 15:31:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Don't expect specific ms_power_lvl when running without trxcon In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Don't expect specific ms_power_lvl when running without trxcon ...................................................................... Patch Set 1: Code-Review-1 as stated on IRC, I think the proper solution is to introduce module parameters that can be set by the config file for the expected avg/mean power level and toa as well as a permitted delta. Then compute the min/max ranges from those values and use those in the templates. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 15:31: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 Sep 25 15:31:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 15:31:55 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert AMR S15-S0 to gsm0408 settings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11082 ) Change subject: gsm0808: add function to convert AMR S15-S0 to gsm0408 settings ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11082 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: I973736273c236eee84decf15868190e339c3fed4 Gerrit-Change-Number: 11082 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 15:31: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 Sep 25 15:32:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 15:32:13 +0000 Subject: Change in libosmocore[master]: gsm_utils: add function to get value strings for gsm48_chan_mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11078 ) Change subject: gsm_utils: add function to get value strings for gsm48_chan_mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11078 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: If715705e1ebdfcfdfae1c2099932f7bb8b3861a7 Gerrit-Change-Number: 11078 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 15:32:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 15:32:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 15:32:14 +0000 Subject: Change in libosmocore[master]: gsm_utils: add function to get value strings for gsm48_chan_mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11078 ) Change subject: gsm_utils: add function to get value strings for gsm48_chan_mode ...................................................................... gsm_utils: add function to get value strings for gsm48_chan_mode The enum gsm48_chan_mode has value strings, but no function to retrieve those strings. Lets add one. Change-Id: If715705e1ebdfcfdfae1c2099932f7bb8b3861a7 --- M include/osmocom/gsm/gsm_utils.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6ff4459..7eda5b9 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -228,6 +228,8 @@ }; extern const struct value_string gsm_chan_t_names[]; +static inline const char *gsm_chan_t_name(enum gsm48_chan_mode val) +{ return get_value_string(gsm_chan_t_names, val); } /* Deprectated functions */ /* Limit encoding and decoding to use no more than this amount of buffer bytes */ -- To view, visit https://gerrit.osmocom.org/11078 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: If715705e1ebdfcfdfae1c2099932f7bb8b3861a7 Gerrit-Change-Number: 11078 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 Sep 25 15:32:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 15:32:29 +0000 Subject: Change in libosmocore[master]: gsm0808: add function to convert AMR S15-S0 to gsm0408 settings In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11082 ) Change subject: gsm0808: add function to convert AMR S15-S0 to gsm0408 settings ...................................................................... gsm0808: add function to convert AMR S15-S0 to gsm0408 settings Add a function to convert S0-S15 bits to struct gsm48_multi_rate_conf, which hold the codec settings for AMR. Change-Id: I973736273c236eee84decf15868190e339c3fed4 Related: OS#3548 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 233 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 8746ceb..f70dbdb 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -105,6 +105,7 @@ int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr); +void gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, uint16_t s15_s0); /*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 0d6938e..886f546 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1204,6 +1204,47 @@ return s15_s0; } +/*! Determine a GSM 04.08 AMR configuration struct from a set of speech codec + * configuration bits (S0-S15) + * \param[out] cfg AMR configuration in GSM 04.08 format. + * \param[in] s15_s0 configuration bits (S0-S15). */ +void gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, + uint16_t s15_s0) +{ + memset(cfg, 0, sizeof(*cfg)); + + /* Strip option bits */ + s15_s0 &= 0x00ff; + + /* Rate 5,15k must always be present */ + cfg->m5_15 = 1; + + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_4_75 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_4_75 & 0xff)) + cfg->m4_75 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_5_90 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_5_90 & 0xff)) + cfg->m5_90 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_6_70 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_6_70 & 0xff)) + cfg->m6_70 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_7_40 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_7_40 & 0xff)) + cfg->m7_40 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_7_95 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_7_95 & 0xff)) + cfg->m7_95 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_10_2 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_10_2 & 0xff)) + cfg->m10_2 = 1; + if ((s15_s0 & GSM0808_SC_CFG_DEFAULT_AMR_12_2 & 0xff) == + (GSM0808_SC_CFG_DEFAULT_AMR_12_2 & 0xff)) + cfg->m12_2 = 1; + + cfg->ver = 1; + cfg->icmi = 1; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3d08232..dcc491d 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -206,6 +206,7 @@ gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; gsm0808_sc_cfg_from_gsm48_mr_cfg; +gsm48_mr_cfg_from_gsm0808_sc_cfg; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 6faa689..8cf1cf4 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1640,6 +1640,62 @@ test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); } +static void test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single(uint16_t s15_s0) +{ + struct gsm48_multi_rate_conf cfg; + + printf("Input:\n"); + printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + + gsm48_mr_cfg_from_gsm0808_sc_cfg(&cfg, s15_s0); + + printf("Output:\n"); + printf(" m4_75= %u smod= %u\n", cfg.m4_75, cfg.smod); + printf(" m5_15= %u spare= %u\n", cfg.m5_15, cfg.spare); + printf(" m5_90= %u icmi= %u\n", cfg.m5_90, cfg.icmi); + printf(" m6_70= %u nscb= %u\n", cfg.m6_70, cfg.nscb); + printf(" m7_40= %u ver= %u\n", cfg.m7_40, cfg.ver); + printf(" m7_95= %u\n", cfg.m7_95); + printf(" m10_2= %u\n", cfg.m10_2); + printf(" m12_2= %u\n", cfg.m12_2); + + printf("\n"); +} + +void test_gsm48_mr_cfg_from_gsm0808_sc_cfg() +{ + printf("Testing gsm48_mr_cfg_from_gsm0808_sc_cfg():\n"); + + /* Only one codec per setting */ + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_4_75); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_5_15); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_5_90); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_6_70); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_7_40); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_7_95); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_10_2); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_12_2); + + /* Combinations */ + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_4_75 | GSM0808_SC_CFG_DEFAULT_AMR_6_70 | + GSM0808_SC_CFG_DEFAULT_AMR_10_2); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_10_2 | GSM0808_SC_CFG_DEFAULT_AMR_12_2 | + GSM0808_SC_CFG_DEFAULT_AMR_7_40); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single + (GSM0808_SC_CFG_DEFAULT_AMR_7_95 | GSM0808_SC_CFG_DEFAULT_AMR_12_2); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1692,6 +1748,7 @@ test_gsm0808_enc_dec_cell_id_global(); test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); + test_gsm48_mr_cfg_from_gsm0808_sc_cfg(); printf("Done\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index dc1deba..58bc509 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -299,4 +299,137 @@ Result (hr): S15-S0 = 073f = 0b0000011100111111 +Testing gsm48_mr_cfg_from_gsm0808_sc_cfg(): +Input: + S15-S0 = ff03 = 0b1111111100000011 +Output: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 0000 = 0b0000000000000000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = ff06 = 0b1111111100000110 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 1 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 3e08 = 0b0011111000001000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 0c12 = 0b0000110000010010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = c020 = 0b1100000000100000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 1 + m10_2= 0 + m12_2= 0 + +Input: + S15-S0 = 3040 = 0b0011000001000000 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 1 + m12_2= 0 + +Input: + S15-S0 = c082 = 0b1100000010000010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 0 + m12_2= 1 + +Input: + S15-S0 = ff4b = 0b1111111101001011 +Output: + m4_75= 1 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 1 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 0 + m10_2= 1 + m12_2= 0 + +Input: + S15-S0 = fcd2 = 0b1111110011010010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 1 ver= 1 + m7_95= 0 + m10_2= 1 + m12_2= 1 + +Input: + S15-S0 = c0a2 = 0b1100000010100010 +Output: + m4_75= 0 smod= 0 + m5_15= 1 spare= 0 + m5_90= 0 icmi= 1 + m6_70= 0 nscb= 0 + m7_40= 0 ver= 1 + m7_95= 1 + m10_2= 0 + m12_2= 1 + Done -- To view, visit https://gerrit.osmocom.org/11082 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: I973736273c236eee84decf15868190e339c3fed4 Gerrit-Change-Number: 11082 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 Tue Sep 25 17:48:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 17:48:27 +0000 Subject: Change in libosmocore[master]: Add new osmo-config-merge utility Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11084 Change subject: Add new osmo-config-merge utility ...................................................................... Add new osmo-config-merge utility This utility allows you to merge an incremental config "patch" into an osmocom-style config file. The patch file follows the same syntax as the original config file. It works by appending the leaf nodes of the patch file to the respective nodes of the input config file. This process allows configuration file changes/updates to be performed in a more stable/reliable way than by means of [unified] diff files, as they break every time the context lines break. osmo-config-merge doesn't suffer from this problem, as it understands the tree-like nature of VTY config files. NITE: This only works with configuration files that have proper indenting, i.e. every level in the hierarchy must be indented excatly one character, not multiple. Change-Id: I61997a3668cc3a40d12ca023272f6d782e6fbefe --- M utils/Makefile.am A utils/osmo-config-merge.c 2 files changed, 216 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/11084/1 diff --git a/utils/Makefile.am b/utils/Makefile.am index d4999bd..fb79190 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -5,12 +5,16 @@ EXTRA_DIST = conv_gen.py conv_codes_gsm.py -bin_PROGRAMS = osmo-arfcn osmo-auc-gen +bin_PROGRAMS = osmo-arfcn osmo-auc-gen osmo-config-merge osmo_arfcn_SOURCES = osmo-arfcn.c osmo_auc_gen_SOURCES = osmo-auc-gen.c +osmo_config_merge_SOURCES = osmo-config-merge.c +osmo_config_merge_LDADD = $(LDADD) $(TALLOC_LIBS) +osmo_config_merge_CFLAGS = $(TALLOC_CFLAGS) + if ENABLE_PCSC noinst_PROGRAMS = osmo-sim-test osmo_sim_test_SOURCES = osmo-sim-test.c diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c new file mode 100644 index 0000000..bd22cef --- /dev/null +++ b/utils/osmo-config-merge.c @@ -0,0 +1,211 @@ +#include +#include + +#include +#include +#include + +struct node { + struct node *parent; /* back-pointer */ + struct llist_head list; /* part of parent->children */ + struct llist_head children; /* our own children */ + char *line; +}; + +/* allocate a new node */ +static struct node *node_alloc(void *ctx) +{ + struct node *node = talloc_zero(ctx, struct node); + OSMO_ASSERT(node); + INIT_LLIST_HEAD(&node->children); + return node; +} + +/* allocate a new node as child of given parent */ +static struct node *node_alloc_child(struct node *parent) +{ + struct node *node = node_alloc(parent); + node->parent = parent; + llist_add_tail(&node->list, &parent->children); + return node; +} + +/* find a given child specified by name/line string within given parent */ +static struct node *node_find_child(struct node *parent, const char *line) +{ + struct node *n; + + llist_for_each_entry(n, &parent->children, list) { + if (!strcmp(line, n->line)) + return n; + } + return NULL; +} + +/* count the number of spaces / indent level */ +static int count_indent(const char *line) +{ + int i; + + for (i = 0; i < strlen(line); i++) { + if (line[i] != ' ') + return i; + } + return i; +} + +/* strip any triling CR / LF */ +static void chomp(char *line) +{ + while (1) { + int len = strlen(line); + if (len == 0) + return; + char *lastch = &line[len-1]; + switch (*lastch) { + case '\n': + case '\r': + *lastch = '\0'; + default: + return; + } + } +} + +/* read a config file and parse it into a tree of nodes */ +static struct node *file_read(void *ctx, const char *fname) +{ + struct node *root, *last; + FILE *infile; + char line[1024]; + int cur_indent = -1; + + infile = fopen(fname, "r"); + if (!infile) + return NULL; + + root = node_alloc(ctx); + last = root; + while (fgets(line, sizeof(line), infile)) { + chomp(line); + int indent = count_indent(line); + struct node *n; + if (indent > cur_indent) { + /* new child to last node */ + n = node_alloc_child(last); + } else if (indent < cur_indent) { + for (int i = 0; i < cur_indent - indent; i++) { + /* go to parent, add another sibling */ + if (last->parent) + last = last->parent; + } + n = node_alloc_child(last->parent); + } else { + /* add a new sibling (child of parent) */ + n = node_alloc_child(last->parent); + } + n->line = talloc_strdup(n, line); + + last = n; + cur_indent = indent; + } + + return root; +} + +static void append_patch(struct node *cfg, struct node *patch) +{ + struct node *n; + + llist_for_each_entry(n, &patch->children, list) { + if (llist_empty(&n->children)) { + struct node *t; + /* we are an end-node, i.e. something that needs to be + * patched into the original tree. We do this by simply + * appending it to the list of siblings */ + t = node_alloc_child(cfg); + t->line = talloc_strdup(t, n->line); + } else { + struct node *c; + /* we need to iterate / recurse further */ + + /* try to find the matching original node */ + c = node_find_child(cfg, n->line); + if (!c) { + /* create it, if it's missing */ + c = node_alloc_child(cfg); + c->line = talloc_strdup(c, n->line); + } + append_patch(c, n); + } + } +} + + +static int level = -1; + +static void dump_node(struct node *root, FILE *out, bool print_node_depth) +{ + struct node *n; + level++; + + if (root->line) { + if (print_node_depth) { + for (int i = 0; i < level; i++) + fputc('*', out); + } + + fprintf(out, "%s\n", root->line); + } + + llist_for_each_entry(n, &root->children, list) { + dump_node(n, out, print_node_depth); + } + level--; +} + +static void exit_usage(int rc) +{ + fprintf(stderr, "Usage: osmo-config-merge [--debug]\n"); + exit(rc); +} + + +int main(int argc, char **argv) +{ + const char *base_fname, *patch_fname; + struct node *base_tree, *patch_tree; + bool debug_enabled = false; + + void *ctx = talloc_named_const(NULL, 0, "root"); + + if (argc < 3) + exit_usage(1); + + base_fname = argv[1]; + patch_fname = argv[2]; + + if (argc > 3) { + if (!strcmp(argv[3], "--debug")) + debug_enabled = true; + else + exit_usage(1); + } + + base_tree = file_read(ctx, base_fname); + patch_tree = file_read(ctx, patch_fname); + + if (debug_enabled) { + fprintf(stderr, "====== dumping tree (base)\n"); + dump_node(base_tree, stderr, true); + fprintf(stderr, "====== dumping tree (patch)\n"); + dump_node(patch_tree, stderr, true); + } + + append_patch(base_tree, patch_tree); + + if (debug_enabled) + fprintf(stderr, "====== dumping tree (patched)\n"); + dump_node(base_tree, stdout, false); + fflush(stdout); +} -- To view, visit https://gerrit.osmocom.org/11084 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: I61997a3668cc3a40d12ca023272f6d782e6fbefe Gerrit-Change-Number: 11084 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:03:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:03:04 +0000 Subject: Change in libosmocore[master]: Add new osmo-config-merge utility In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11084 to look at the new patch set (#2). Change subject: Add new osmo-config-merge utility ...................................................................... Add new osmo-config-merge utility This utility allows you to merge an incremental config "patch" into an osmocom-style config file. The patch file follows the same syntax as the original config file. It works by appending the leaf nodes of the patch file to the respective nodes of the input config file. This process allows configuration file changes/updates to be performed in a more stable/reliable way than by means of [unified] diff files, as they break every time the context lines break. osmo-config-merge doesn't suffer from this problem, as it understands the tree-like nature of VTY config files. NITE: This only works with configuration files that have proper indenting, i.e. every level in the hierarchy must be indented excatly one character, not multiple. Change-Id: I61997a3668cc3a40d12ca023272f6d782e6fbefe --- M debian/libosmocore-utils.install M utils/Makefile.am A utils/osmo-config-merge.c 3 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/11084/2 -- To view, visit https://gerrit.osmocom.org/11084 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: I61997a3668cc3a40d12ca023272f6d782e6fbefe Gerrit-Change-Number: 11084 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 Tue Sep 25 18:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:05:31 +0000 Subject: Change in libosmocore[master]: Add new osmo-config-merge utility In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11084 to look at the new patch set (#3). Change subject: Add new osmo-config-merge utility ...................................................................... Add new osmo-config-merge utility This utility allows you to merge an incremental config "patch" into an osmocom-style config file. The patch file follows the same syntax as the original config file. It works by appending the leaf nodes of the patch file to the respective nodes of the input config file. This process allows configuration file changes/updates to be performed in a more stable/reliable way than by means of [unified] diff files, as they break every time the context lines break. osmo-config-merge doesn't suffer from this problem, as it understands the tree-like nature of VTY config files. NITE: This only works with configuration files that have proper indenting, i.e. every level in the hierarchy must be indented excatly one character, not multiple. Change-Id: I61997a3668cc3a40d12ca023272f6d782e6fbefe --- M .gitignore M debian/control M debian/libosmocore-utils.install M utils/Makefile.am A utils/osmo-config-merge.c 5 files changed, 275 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/11084/3 -- To view, visit https://gerrit.osmocom.org/11084 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: I61997a3668cc3a40d12ca023272f6d782e6fbefe Gerrit-Change-Number: 11084 Gerrit-PatchSet: 3 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 Tue Sep 25 18:11:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:11:59 +0000 Subject: Change in osmo-bts[master]: ensure all config file examples are well-formed Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11085 Change subject: ensure all config file examples are well-formed ...................................................................... ensure all config file examples are well-formed We used to permit multiple spaces to enter a new node in the config, but modern osmo* code writes config files well-formed where every node equals exactly one indent level. Change-Id: I3da56b34e87503c46e6bf3c7505b83ec5e6aaa20 --- M doc/examples/litecell15/lc15bts-mgr.cfg M doc/examples/litecell15/osmo-bts-lc15.cfg M doc/examples/octphy/osmo-bts-octphy.cfg M doc/examples/octphy/osmo-bts-trx2dsp1.cfg M doc/examples/sysmo/osmo-bts-sysmo.cfg M doc/examples/sysmo/sysmobts-mgr.cfg M doc/examples/trx/osmo-bts-trx-calypso.cfg M doc/examples/trx/osmo-bts-trx.cfg M doc/examples/virtual/openbsc-virtual.cfg M doc/examples/virtual/osmo-bts-virtual.cfg 10 files changed, 193 insertions(+), 193 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/11085/1 diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index e67742c..a92a3fd 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -3,41 +3,41 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level temp info - logging level fw info - logging level find info - logging level calib info - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level temp info + logging level fw info + logging level find info + logging level calib info + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice ! line vty no login ! lc15bts-mgr limits supply_volt - threshold warning min 17500 - threshold critical min 19000 + threshold warning min 17500 + threshold critical min 19000 limits tx0_vswr - threshold warning max 1000 + threshold warning max 1000 limits tx1_vswr - threshold warning max 1000 + threshold warning max 1000 limits supply_pwr - threshold warning max 110 - threshold critical max 120 + threshold warning max 110 + threshold critical max 120 limits pa0_pwr - threshold warning max 50 - threshold critical max 60 + threshold warning max 50 + threshold critical max 60 limits pa1_pwr - threshold warning max 50 - threshold critical max 60 + threshold warning max 50 + threshold critical max 60 diff --git a/doc/examples/litecell15/osmo-bts-lc15.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg index f0bafe8..907d83a 100644 --- a/doc/examples/litecell15/osmo-bts-lc15.cfg +++ b/doc/examples/litecell15/osmo-bts-lc15.cfg @@ -3,26 +3,26 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp debug - logging level abis notice - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level abis notice + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice ! line vty no login diff --git a/doc/examples/octphy/osmo-bts-octphy.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg index c729d1a..d6d03b5 100644 --- a/doc/examples/octphy/osmo-bts-octphy.cfg +++ b/doc/examples/octphy/osmo-bts-octphy.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp info - logging level abis notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice ! line vty no login diff --git a/doc/examples/octphy/osmo-bts-trx2dsp1.cfg b/doc/examples/octphy/osmo-bts-trx2dsp1.cfg index 3406e07..bf590f7 100644 --- a/doc/examples/octphy/osmo-bts-trx2dsp1.cfg +++ b/doc/examples/octphy/osmo-bts-trx2dsp1.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp info - logging level abis notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice ! line vty no login diff --git a/doc/examples/sysmo/osmo-bts-sysmo.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg index 87dfae0..6ff043d 100644 --- a/doc/examples/sysmo/osmo-bts-sysmo.cfg +++ b/doc/examples/sysmo/osmo-bts-sysmo.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp info - logging level abis notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice ! line vty no login diff --git a/doc/examples/sysmo/sysmobts-mgr.cfg b/doc/examples/sysmo/sysmobts-mgr.cfg index 0cb1d8c..f891ada 100644 --- a/doc/examples/sysmo/sysmobts-mgr.cfg +++ b/doc/examples/sysmo/sysmobts-mgr.cfg @@ -3,19 +3,19 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging timestamp 0 - logging level temp info - logging level fw info - logging level find info - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice + logging filter all 1 + logging color 1 + logging timestamp 0 + logging level temp info + logging level fw info + logging level find info + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice ! line vty no login diff --git a/doc/examples/trx/osmo-bts-trx-calypso.cfg b/doc/examples/trx/osmo-bts-trx-calypso.cfg index fa01953..6b52fd2 100644 --- a/doc/examples/trx/osmo-bts-trx-calypso.cfg +++ b/doc/examples/trx/osmo-bts-trx-calypso.cfg @@ -4,18 +4,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl notice - logging level oml notice - logging level rll notice - logging level rr notice - logging level meas error - logging level pag error - logging level l1c error - logging level l1p error - logging level dsp error - logging level abis error + logging color 1 + logging timestamp 0 + logging level rsl notice + logging level oml notice + logging level rll notice + logging level rr notice + logging level meas error + logging level pag error + logging level l1c error + logging level l1p error + logging level dsp error + logging level abis error ! line vty no login diff --git a/doc/examples/trx/osmo-bts-trx.cfg b/doc/examples/trx/osmo-bts-trx.cfg index 805d929..8342697 100644 --- a/doc/examples/trx/osmo-bts-trx.cfg +++ b/doc/examples/trx/osmo-bts-trx.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl notice - logging level oml notice - logging level rll notice - logging level rr notice - logging level meas error - logging level pag error - logging level l1c error - logging level l1p error - logging level dsp error - logging level abis error + logging color 1 + logging timestamp 0 + logging level rsl notice + logging level oml notice + logging level rll notice + logging level rr notice + logging level meas error + logging level pag error + logging level l1c error + logging level l1p error + logging level dsp error + logging level abis error ! line vty no login diff --git a/doc/examples/virtual/openbsc-virtual.cfg b/doc/examples/virtual/openbsc-virtual.cfg index 8044fa8..be79d58 100644 --- a/doc/examples/virtual/openbsc-virtual.cfg +++ b/doc/examples/virtual/openbsc-virtual.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all info - logging level rll notice - logging level cc notice - logging level mm debug - logging level rr notice - logging level rsl notice - logging level nm info - logging level mncc notice - logging level pag notice - logging level meas notice - logging level sccp notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level db notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level llc debug - logging level sndcp debug - logging level nat notice - logging level ctrl notice - logging level smpp debug - logging level filter debug - logging level ranap debug - logging level sua debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all info + logging level rll notice + logging level cc notice + logging level mm debug + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level filter debug + logging level ranap debug + logging level sua debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice ! stats interval 5 ! diff --git a/doc/examples/virtual/osmo-bts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg index fa22316..dbdc22f 100644 --- a/doc/examples/virtual/osmo-bts-virtual.cfg +++ b/doc/examples/virtual/osmo-bts-virtual.cfg @@ -3,36 +3,36 @@ !! ! log stderr - logging filter all 0 - logging color 0 - logging print category 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp error - logging level pcu notice - logging level ho debug - logging level trx notice - logging level loop notice - logging level abis debug - logging level rtp notice - logging level sum error - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats error + logging filter all 0 + logging color 0 + logging print category 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp error + logging level pcu notice + logging level ho debug + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum error + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats error ! line vty no login -- To view, visit https://gerrit.osmocom.org/11085 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: I3da56b34e87503c46e6bf3c7505b83ec5e6aaa20 Gerrit-Change-Number: 11085 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:17:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:17:16 +0000 Subject: Change in libosmocore[master]: logging_vty: Ensure writing well-formed config files Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11086 Change subject: logging_vty: Ensure writing well-formed config files ...................................................................... logging_vty: Ensure writing well-formed config files We want to have well-formed config files that print exactly one space per VTY/config node level, and not two. Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66 --- M src/vty/logging_vty.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/11086/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index b2637a5..31edb52 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -890,24 +890,24 @@ break; } - vty_out(vty, " logging filter all %u%s", + vty_out(vty, " logging filter all %u%s", tgt->filter_map & (1 << LOG_FLT_ALL) ? 1 : 0, VTY_NEWLINE); /* save filters outside of libosmocore, i.e. in app code */ if (osmo_log_info->save_fn) osmo_log_info->save_fn(vty, osmo_log_info, tgt); - vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0, + vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0, VTY_NEWLINE); - vty_out(vty, " logging print category %d%s", + vty_out(vty, " logging print category %d%s", tgt->print_category ? 1 : 0, VTY_NEWLINE); if (tgt->print_ext_timestamp) - vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE); + vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE); else - vty_out(vty, " logging timestamp %u%s", + vty_out(vty, " logging timestamp %u%s", tgt->print_timestamp ? 1 : 0, VTY_NEWLINE); if (tgt->print_level) - vty_out(vty, " logging print level 1%s", VTY_NEWLINE); - vty_out(vty, " logging print file %s%s", + vty_out(vty, " logging print level 1%s", VTY_NEWLINE); + vty_out(vty, " logging print file %s%s", get_value_string(logging_print_file_args, tgt->print_filename2), VTY_NEWLINE); @@ -918,7 +918,7 @@ vty_out(vty, "%% Invalid log level %u for 'force-all'%s", tgt->loglevel, VTY_NEWLINE); else - vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); + vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); } for (i = 0; i < osmo_log_info->num_cat; i++) { @@ -941,7 +941,7 @@ continue; } - vty_out(vty, " logging level %s", cat_name); + vty_out(vty, " logging level %s", cat_name); vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/11086 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: Ia75c7067284ea225cffe13ca71bad05a7747ae66 Gerrit-Change-Number: 11086 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:22:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:22:19 +0000 Subject: Change in libosmocore[master]: logging_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11086 to look at the new patch set (#2). Change subject: logging_vty: Ensure writing well-formed config files ...................................................................... logging_vty: Ensure writing well-formed config files We want to have well-formed config files that print exactly one space per VTY/config node level, and not two. Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66 --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/11086/2 -- To view, visit https://gerrit.osmocom.org/11086 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: Ia75c7067284ea225cffe13ca71bad05a7747ae66 Gerrit-Change-Number: 11086 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 Tue Sep 25 18:25:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:25:53 +0000 Subject: Change in libosmocore[master]: logging_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11086 to look at the new patch set (#3). Change subject: logging_vty: Ensure writing well-formed config files ...................................................................... logging_vty: Ensure writing well-formed config files We want to have well-formed config files that print exactly one space per VTY/config node level, and not two. Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66 --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/11086/3 -- To view, visit https://gerrit.osmocom.org/11086 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: Ia75c7067284ea225cffe13ca71bad05a7747ae66 Gerrit-Change-Number: 11086 Gerrit-PatchSet: 3 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 Tue Sep 25 18:30:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:30:01 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp.cfg: Ensure example config is well-formed Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11087 Change subject: osmo-stp.cfg: Ensure example config is well-formed ...................................................................... osmo-stp.cfg: Ensure example config is well-formed Change-Id: I042486249ae1390a4fedbcf356e488451277788f --- M doc/examples/osmo-stp.cfg 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/87/11087/1 diff --git a/doc/examples/osmo-stp.cfg b/doc/examples/osmo-stp.cfg index 960bf33..ed37672 100644 --- a/doc/examples/osmo-stp.cfg +++ b/doc/examples/osmo-stp.cfg @@ -3,14 +3,14 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug line vty no login ! -- To view, visit https://gerrit.osmocom.org/11087 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: I042486249ae1390a4fedbcf356e488451277788f Gerrit-Change-Number: 11087 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:30:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:30:53 +0000 Subject: Change in osmo-ggsn[master]: osmo-ggsn.cfg: Ensure well-formed config file example Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11088 Change subject: osmo-ggsn.cfg: Ensure well-formed config file example ...................................................................... osmo-ggsn.cfg: Ensure well-formed config file example Change-Id: Ic7fd91745e7442eda741d46748c0a4a02dedef80 --- M doc/examples/osmo-ggsn.cfg 1 file changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/88/11088/1 diff --git a/doc/examples/osmo-ggsn.cfg b/doc/examples/osmo-ggsn.cfg index 8317684..4000636 100644 --- a/doc/examples/osmo-ggsn.cfg +++ b/doc/examples/osmo-ggsn.cfg @@ -3,32 +3,32 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/11088 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: Ic7fd91745e7442eda741d46748c0a4a02dedef80 Gerrit-Change-Number: 11088 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:33:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:33:32 +0000 Subject: Change in osmo-trx[master]: ensure well-formed example config files Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11089 Change subject: ensure well-formed example config files ...................................................................... ensure well-formed example config files Change-Id: I9be2bab3b88a96e94e463e5ab22f9814bd6de950 --- M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 4 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/11089/1 diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index 7f622b0..fae5b35 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index 7f622b0..fae5b35 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 9c80933..06eb3e9 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index 53fa24e..af29929 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login -- To view, visit https://gerrit.osmocom.org/11089 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: I9be2bab3b88a96e94e463e5ab22f9814bd6de950 Gerrit-Change-Number: 11089 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:36:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:36:55 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr.cfg: Ensure well-formed config file example Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11090 Change subject: osmo-hlr.cfg: Ensure well-formed config file example ...................................................................... osmo-hlr.cfg: Ensure well-formed config file example Change-Id: I136fdda6f4088f2e8094eed6fe9481f5d6476d4f --- M doc/examples/osmo-hlr.cfg 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/90/11090/1 diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg index 54993a9..a685858 100644 --- a/doc/examples/osmo-hlr.cfg +++ b/doc/examples/osmo-hlr.cfg @@ -2,18 +2,18 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging print category-hex 0 - logging print level 1 - logging print file basename last - logging print extended-timestamp 1 - logging level main notice - logging level db notice - logging level auc notice - logging level ss info - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last + logging print extended-timestamp 1 + logging level main notice + logging level db notice + logging level auc notice + logging level ss info + logging level linp error ! line vty bind 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/11090 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: I136fdda6f4088f2e8094eed6fe9481f5d6476d4f Gerrit-Change-Number: 11090 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:39:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:39:49 +0000 Subject: Change in osmo-sgsn[master]: gbproxy-legacy: Ensure well-formed config file Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11091 Change subject: gbproxy-legacy: Ensure well-formed config file ...................................................................... gbproxy-legacy: Ensure well-formed config file Change-Id: I3495c8448459ba4f834744a1df6e7aa6a196d755 --- M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg 1 file changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/91/11091/1 diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg index 15fd74a..c471c38 100644 --- a/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg +++ b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg @@ -3,20 +3,20 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging timestamp 0 - logging level all debug - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice + logging filter all 1 + logging color 1 + logging timestamp 0 + logging level all debug + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/11091 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: I3495c8448459ba4f834744a1df6e7aa6a196d755 Gerrit-Change-Number: 11091 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:42:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:42:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ensure well-formed config files Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11092 Change subject: ensure well-formed config files ...................................................................... ensure well-formed config files Change-Id: I09eedd3cda993b9fabfdcf7caf0b3a050eaad9b1 --- M bsc/osmo-bsc.cfg M bsc/osmo-stp.cfg M msc/osmo-msc.cfg M msc/osmo-stp.cfg 4 files changed, 119 insertions(+), 119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/11092/1 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 1ccef09..b85c690 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -4,43 +4,43 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg index c56ba93..f40a02f 100644 --- a/bsc/osmo-stp.cfg +++ b/bsc/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 80f2fba..3f9e192 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -3,44 +3,44 @@ !! ! log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc debug - logging level mm debug - logging level rr notice - logging level mncc debug - logging level pag notice - logging level msc notice - logging level mgcp debug - logging level ho notice - logging level db notice - logging level ref notice - logging level ctrl notice - logging level smpp debug - logging level ranap debug - logging level vlr debug - logging level iucs debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc debug + logging level mm debug + logging level rr notice + logging level mncc debug + logging level pag notice + logging level msc notice + logging level mgcp debug + logging level ho notice + logging level db notice + logging level ref notice + logging level ctrl notice + logging level smpp debug + logging level ranap debug + logging level vlr debug + logging level iucs debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/msc/osmo-stp.cfg b/msc/osmo-stp.cfg index aa0a326..17e611a 100644 --- a/msc/osmo-stp.cfg +++ b/msc/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/11092 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: I09eedd3cda993b9fabfdcf7caf0b3a050eaad9b1 Gerrit-Change-Number: 11092 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:48:22 +0000 Subject: Change in docker-playground[master]: ensure well-formed config files Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11093 Change subject: ensure well-formed config files ...................................................................... ensure well-formed config files Change-Id: Id687e63c418e2e955ccbb92f2420a80fc0704ea4 --- M m3ua-test/osmo-stp.cfg M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg M osmo-bts-latest/osmo-bts.cfg M osmo-bts-master/osmo-bts.cfg M osmo-ggsn-latest/osmo-ggsn.cfg M osmo-ggsn-master/osmo-ggsn.cfg M osmo-hlr-latest/osmo-hlr.cfg M osmo-hlr-master/osmo-hlr.cfg M osmo-mgw-latest/osmo-mgw.cfg M osmo-mgw-master/osmo-mgw.cfg M osmo-nitb-master/openbsc.cfg M osmo-stp-latest/osmo-stp.cfg M osmo-stp-master/osmo-stp.cfg M sua-test/osmo-stp.cfg M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/osmo-stp.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg M ttcn3-bts-test/osmo-bsc.cfg M ttcn3-bts-test/osmo-bts.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg M ttcn3-hlr-test/osmo-hlr.cfg M ttcn3-mgw-test/osmo-mgw.cfg M ttcn3-msc-test/osmo-msc.cfg M ttcn3-msc-test/osmo-stp.cfg M ttcn3-sgsn-test/osmo-sgsn.cfg M ttcn3-sip-test/osmo-sip-connector.cfg 27 files changed, 908 insertions(+), 908 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/11093/1 diff --git a/m3ua-test/osmo-stp.cfg b/m3ua-test/osmo-stp.cfg index db16ad3..23d94e0 100644 --- a/m3ua-test/osmo-stp.cfg +++ b/m3ua-test/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 6b79592..4a69b3a 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -4,43 +4,43 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 5b8093c..f381ace 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -4,43 +4,43 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-bts-latest/osmo-bts.cfg b/osmo-bts-latest/osmo-bts.cfg index e8feff5..446a1b7 100644 --- a/osmo-bts-latest/osmo-bts.cfg +++ b/osmo-bts-latest/osmo-bts.cfg @@ -3,43 +3,43 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level all everything - logging level rsl info - logging level oml debug - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp debug - logging level pcu debug - logging level ho notice - logging level trx notice - logging level loop notice - logging level abis debug - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rsl info + logging level oml debug + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level pcu debug + logging level ho notice + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! line vty no login diff --git a/osmo-bts-master/osmo-bts.cfg b/osmo-bts-master/osmo-bts.cfg index e8feff5..446a1b7 100644 --- a/osmo-bts-master/osmo-bts.cfg +++ b/osmo-bts-master/osmo-bts.cfg @@ -3,43 +3,43 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level all everything - logging level rsl info - logging level oml debug - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp debug - logging level pcu debug - logging level ho notice - logging level trx notice - logging level loop notice - logging level abis debug - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rsl info + logging level oml debug + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level pcu debug + logging level ho notice + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! line vty no login diff --git a/osmo-ggsn-latest/osmo-ggsn.cfg b/osmo-ggsn-latest/osmo-ggsn.cfg index b828789..5337ac8 100644 --- a/osmo-ggsn-latest/osmo-ggsn.cfg +++ b/osmo-ggsn-latest/osmo-ggsn.cfg @@ -3,59 +3,59 @@ !! ! log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-ggsn-master/osmo-ggsn.cfg b/osmo-ggsn-master/osmo-ggsn.cfg index b828789..5337ac8 100644 --- a/osmo-ggsn-master/osmo-ggsn.cfg +++ b/osmo-ggsn-master/osmo-ggsn.cfg @@ -3,59 +3,59 @@ !! ! log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-hlr-latest/osmo-hlr.cfg b/osmo-hlr-latest/osmo-hlr.cfg index 71a76c8..f3be518 100644 --- a/osmo-hlr-latest/osmo-hlr.cfg +++ b/osmo-hlr-latest/osmo-hlr.cfg @@ -2,13 +2,13 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level all debug - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error ! line vty bind 0.0.0.0 diff --git a/osmo-hlr-master/osmo-hlr.cfg b/osmo-hlr-master/osmo-hlr.cfg index 71a76c8..f3be518 100644 --- a/osmo-hlr-master/osmo-hlr.cfg +++ b/osmo-hlr-master/osmo-hlr.cfg @@ -2,13 +2,13 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level all debug - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error ! line vty bind 0.0.0.0 diff --git a/osmo-mgw-latest/osmo-mgw.cfg b/osmo-mgw-latest/osmo-mgw.cfg index 4bdde6b..44653e3 100644 --- a/osmo-mgw-latest/osmo-mgw.cfg +++ b/osmo-mgw-latest/osmo-mgw.cfg @@ -3,29 +3,29 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/osmo-mgw-master/osmo-mgw.cfg b/osmo-mgw-master/osmo-mgw.cfg index 4bdde6b..44653e3 100644 --- a/osmo-mgw-master/osmo-mgw.cfg +++ b/osmo-mgw-master/osmo-mgw.cfg @@ -3,29 +3,29 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/osmo-nitb-master/openbsc.cfg b/osmo-nitb-master/openbsc.cfg index 8df89f1..31c9a0c 100644 --- a/osmo-nitb-master/openbsc.cfg +++ b/osmo-nitb-master/openbsc.cfg @@ -4,54 +4,54 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level all everything - logging level rll notice - logging level cc notice - logging level mm debug - logging level rr notice - logging level rsl notice - logging level nm info - logging level mncc notice - logging level pag notice - logging level meas notice - logging level sccp notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level db notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level llc debug - logging level sndcp debug - logging level nat notice - logging level ctrl notice - logging level smpp debug - logging level filter debug - logging level ranap debug - logging level sua debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm debug + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level filter debug + logging level ranap debug + logging level sua debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! stats interval 5 ! diff --git a/osmo-stp-latest/osmo-stp.cfg b/osmo-stp-latest/osmo-stp.cfg index aab7f32..ada8378 100644 --- a/osmo-stp-latest/osmo-stp.cfg +++ b/osmo-stp-latest/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/osmo-stp-master/osmo-stp.cfg b/osmo-stp-master/osmo-stp.cfg index aab7f32..ada8378 100644 --- a/osmo-stp-master/osmo-stp.cfg +++ b/osmo-stp-master/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/sua-test/osmo-stp.cfg b/sua-test/osmo-stp.cfg index 23a3eb1..a0043df 100644 --- a/sua-test/osmo-stp.cfg +++ b/sua-test/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 5255127..4249818 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -4,44 +4,44 @@ password foo ! log file /data/osmo-bsc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-bsc-test/osmo-stp.cfg b/ttcn3-bsc-test/osmo-stp.cfg index 09c8a43..0f25f0f 100644 --- a/ttcn3-bsc-test/osmo-stp.cfg +++ b/ttcn3-bsc-test/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 858aa50..4914607 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -4,44 +4,44 @@ password foo ! log file /data/osmo-bsc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 12ee409..13ecd40 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -4,46 +4,46 @@ password foo ! log file /data/osmo-bsc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging print file 1 - logging level all everything - logging level rll info - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl debug - logging level nm notice - logging level pag notice - logging level meas notice - logging level msc debug - logging level mgcp notice - logging level ho notice - logging level hodec notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level rll info + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl debug + logging level nm notice + logging level pag notice + logging level meas notice + logging level msc debug + logging level mgcp notice + logging level ho notice + logging level hodec notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index ae809fd..04a9d17 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -3,42 +3,42 @@ !! ! log file /data/osmo-bts.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas info - logging level pag info - logging level l1c info - logging level l1p notice - logging level dsp info - logging level pcu debug - logging level ho notice - logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas info + logging level pag info + logging level l1c info + logging level l1p notice + logging level dsp info + logging level pcu debug + logging level ho notice + logging level trx info + logging level loop notice + logging level abis notice + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib debug + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! line vty no login diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 7fe5cbc..696c3f7 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -3,59 +3,59 @@ !! ! log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-hlr-test/osmo-hlr.cfg b/ttcn3-hlr-test/osmo-hlr.cfg index 9192b58..8ed77d4 100644 --- a/ttcn3-hlr-test/osmo-hlr.cfg +++ b/ttcn3-hlr-test/osmo-hlr.cfg @@ -2,13 +2,13 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level all debug - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error ! line vty bind 0.0.0.0 diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index acf7e31..eb2f7ef 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -3,29 +3,29 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index 8fa38ad..f0180d8 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -3,44 +3,44 @@ !! ! log file /data/osmo-msc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc debug - logging level mm debug - logging level rr notice - logging level mncc debug - logging level pag notice - logging level msc notice - logging level mgcp debug - logging level ho notice - logging level db notice - logging level ref notice - logging level ctrl notice - logging level smpp debug - logging level ranap debug - logging level vlr debug - logging level iucs debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc debug + logging level mm debug + logging level rr notice + logging level mncc debug + logging level pag notice + logging level msc notice + logging level mgcp debug + logging level ho notice + logging level db notice + logging level ref notice + logging level ctrl notice + logging level smpp debug + logging level ranap debug + logging level vlr debug + logging level iucs debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg index f7d1396..50a1878 100644 --- a/ttcn3-msc-test/osmo-stp.cfg +++ b/ttcn3-msc-test/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 0999c51..20dea6e 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -3,42 +3,42 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file 1 - logging level all everything - logging level mm debug - logging level pag notice - logging level meas notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp info - logging level llc debug - logging level sndcp debug - logging level slhc notice - logging level ranap info - logging level sua info - logging level v42bis info - logging level lglobal info - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp debug - logging level lstats notice - logging level lgsup debug - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level mm debug + logging level pag notice + logging level meas notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp info + logging level llc debug + logging level sndcp debug + logging level slhc notice + logging level ranap info + logging level sua info + logging level v42bis info + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp debug + logging level lstats notice + logging level lgsup debug + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-sip-test/osmo-sip-connector.cfg b/ttcn3-sip-test/osmo-sip-connector.cfg index db212ae..1834325 100644 --- a/ttcn3-sip-test/osmo-sip-connector.cfg +++ b/ttcn3-sip-test/osmo-sip-connector.cfg @@ -3,34 +3,34 @@ !! ! log file /data/osmo-sip-connector.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 0 - logging print file basename - logging level all everything - logging level sip debug - logging level mncc debug - logging level app debug - logging level call notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice - logging level ljibuf notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 0 + logging print file basename + logging level all everything + logging level sip debug + logging level mncc debug + logging level app debug + logging level call notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/11093 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: Id687e63c418e2e955ccbb92f2420a80fc0704ea4 Gerrit-Change-Number: 11093 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:51:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:17 +0000 Subject: Change in osmo-sgsn[master]: gbproxy-legacy: Ensure well-formed config file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11091 ) Change subject: gbproxy-legacy: Ensure well-formed config file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11091 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: I3495c8448459ba4f834744a1df6e7aa6a196d755 Gerrit-Change-Number: 11091 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18: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 Tue Sep 25 18:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:19 +0000 Subject: Change in osmo-sgsn[master]: gbproxy-legacy: Ensure well-formed config file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11091 ) Change subject: gbproxy-legacy: Ensure well-formed config file ...................................................................... gbproxy-legacy: Ensure well-formed config file Change-Id: I3495c8448459ba4f834744a1df6e7aa6a196d755 --- M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg index 15fd74a..c471c38 100644 --- a/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg +++ b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg @@ -3,20 +3,20 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging timestamp 0 - logging level all debug - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice + logging filter all 1 + logging color 1 + logging timestamp 0 + logging level all debug + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/11091 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: I3495c8448459ba4f834744a1df6e7aa6a196d755 Gerrit-Change-Number: 11091 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 Tue Sep 25 18:51:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ensure well-formed config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11092 ) Change subject: ensure well-formed config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11092 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: I09eedd3cda993b9fabfdcf7caf0b3a050eaad9b1 Gerrit-Change-Number: 11092 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:51: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 Sep 25 18:51:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ensure well-formed config files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11092 ) Change subject: ensure well-formed config files ...................................................................... ensure well-formed config files Change-Id: I09eedd3cda993b9fabfdcf7caf0b3a050eaad9b1 --- M bsc/osmo-bsc.cfg M bsc/osmo-stp.cfg M msc/osmo-msc.cfg M msc/osmo-stp.cfg 4 files changed, 119 insertions(+), 119 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 1ccef09..b85c690 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -4,43 +4,43 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg index c56ba93..f40a02f 100644 --- a/bsc/osmo-stp.cfg +++ b/bsc/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 80f2fba..3f9e192 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -3,44 +3,44 @@ !! ! log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc debug - logging level mm debug - logging level rr notice - logging level mncc debug - logging level pag notice - logging level msc notice - logging level mgcp debug - logging level ho notice - logging level db notice - logging level ref notice - logging level ctrl notice - logging level smpp debug - logging level ranap debug - logging level vlr debug - logging level iucs debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc debug + logging level mm debug + logging level rr notice + logging level mncc debug + logging level pag notice + logging level msc notice + logging level mgcp debug + logging level ho notice + logging level db notice + logging level ref notice + logging level ctrl notice + logging level smpp debug + logging level ranap debug + logging level vlr debug + logging level iucs debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/msc/osmo-stp.cfg b/msc/osmo-stp.cfg index aa0a326..17e611a 100644 --- a/msc/osmo-stp.cfg +++ b/msc/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/11092 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: I09eedd3cda993b9fabfdcf7caf0b3a050eaad9b1 Gerrit-Change-Number: 11092 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 Tue Sep 25 18:51:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:34 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr.cfg: Ensure well-formed config file example In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11090 ) Change subject: osmo-hlr.cfg: Ensure well-formed config file example ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11090 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: I136fdda6f4088f2e8094eed6fe9481f5d6476d4f Gerrit-Change-Number: 11090 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:51: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 Sep 25 18:51:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:40 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr.cfg: Ensure well-formed config file example In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11090 ) Change subject: osmo-hlr.cfg: Ensure well-formed config file example ...................................................................... osmo-hlr.cfg: Ensure well-formed config file example Change-Id: I136fdda6f4088f2e8094eed6fe9481f5d6476d4f --- M doc/examples/osmo-hlr.cfg 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg index 54993a9..a685858 100644 --- a/doc/examples/osmo-hlr.cfg +++ b/doc/examples/osmo-hlr.cfg @@ -2,18 +2,18 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging print category-hex 0 - logging print level 1 - logging print file basename last - logging print extended-timestamp 1 - logging level main notice - logging level db notice - logging level auc notice - logging level ss info - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last + logging print extended-timestamp 1 + logging level main notice + logging level db notice + logging level auc notice + logging level ss info + logging level linp error ! line vty bind 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/11090 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: I136fdda6f4088f2e8094eed6fe9481f5d6476d4f Gerrit-Change-Number: 11090 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 Tue Sep 25 18:51:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:50 +0000 Subject: Change in osmo-trx[master]: ensure well-formed example config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11089 ) Change subject: ensure well-formed example config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11089 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: I9be2bab3b88a96e94e463e5ab22f9814bd6de950 Gerrit-Change-Number: 11089 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:51: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 Sep 25 18:51:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:51:51 +0000 Subject: Change in osmo-trx[master]: ensure well-formed example config files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11089 ) Change subject: ensure well-formed example config files ...................................................................... ensure well-formed example config files Change-Id: I9be2bab3b88a96e94e463e5ab22f9814bd6de950 --- M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 4 files changed, 24 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index 7f622b0..fae5b35 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index 7f622b0..fae5b35 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 9c80933..06eb3e9 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index 53fa24e..af29929 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -1,10 +1,10 @@ log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file basename - logging level all info + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file basename + logging level all info ! line vty no login -- To view, visit https://gerrit.osmocom.org/11089 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: I9be2bab3b88a96e94e463e5ab22f9814bd6de950 Gerrit-Change-Number: 11089 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 Tue Sep 25 18:52:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:52:01 +0000 Subject: Change in osmo-ggsn[master]: osmo-ggsn.cfg: Ensure well-formed config file example In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11088 ) Change subject: osmo-ggsn.cfg: Ensure well-formed config file example ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11088 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: Ic7fd91745e7442eda741d46748c0a4a02dedef80 Gerrit-Change-Number: 11088 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:52: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 Sep 25 18:52:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:52:02 +0000 Subject: Change in osmo-ggsn[master]: osmo-ggsn.cfg: Ensure well-formed config file example In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11088 ) Change subject: osmo-ggsn.cfg: Ensure well-formed config file example ...................................................................... osmo-ggsn.cfg: Ensure well-formed config file example Change-Id: Ic7fd91745e7442eda741d46748c0a4a02dedef80 --- M doc/examples/osmo-ggsn.cfg 1 file changed, 26 insertions(+), 26 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-ggsn.cfg b/doc/examples/osmo-ggsn.cfg index 8317684..4000636 100644 --- a/doc/examples/osmo-ggsn.cfg +++ b/doc/examples/osmo-ggsn.cfg @@ -3,32 +3,32 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/11088 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: Ic7fd91745e7442eda741d46748c0a4a02dedef80 Gerrit-Change-Number: 11088 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 Tue Sep 25 18:52:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:52:11 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp.cfg: Ensure example config is well-formed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11087 ) Change subject: osmo-stp.cfg: Ensure example config is well-formed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11087 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: I042486249ae1390a4fedbcf356e488451277788f Gerrit-Change-Number: 11087 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:52: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 Sep 25 18:52:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:52:12 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp.cfg: Ensure example config is well-formed In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11087 ) Change subject: osmo-stp.cfg: Ensure example config is well-formed ...................................................................... osmo-stp.cfg: Ensure example config is well-formed Change-Id: I042486249ae1390a4fedbcf356e488451277788f --- M doc/examples/osmo-stp.cfg 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/osmo-stp.cfg b/doc/examples/osmo-stp.cfg index 960bf33..ed37672 100644 --- a/doc/examples/osmo-stp.cfg +++ b/doc/examples/osmo-stp.cfg @@ -3,14 +3,14 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug line vty no login ! -- To view, visit https://gerrit.osmocom.org/11087 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: I042486249ae1390a4fedbcf356e488451277788f Gerrit-Change-Number: 11087 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 Tue Sep 25 18:52:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:52:32 +0000 Subject: Change in libosmocore[master]: logging_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11086 ) Change subject: logging_vty: Ensure writing well-formed config files ...................................................................... Patch Set 3: Code-Review+1 needs testing -- To view, visit https://gerrit.osmocom.org/11086 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: Ia75c7067284ea225cffe13ca71bad05a7747ae66 Gerrit-Change-Number: 11086 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18: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 Tue Sep 25 18:52:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:52:59 +0000 Subject: Change in osmo-bts[master]: ensure all config file examples are well-formed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11085 ) Change subject: ensure all config file examples are well-formed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11085 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: I3da56b34e87503c46e6bf3c7505b83ec5e6aaa20 Gerrit-Change-Number: 11085 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:52: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 Sep 25 18:53:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:53:00 +0000 Subject: Change in osmo-bts[master]: ensure all config file examples are well-formed In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11085 ) Change subject: ensure all config file examples are well-formed ...................................................................... ensure all config file examples are well-formed We used to permit multiple spaces to enter a new node in the config, but modern osmo* code writes config files well-formed where every node equals exactly one indent level. Change-Id: I3da56b34e87503c46e6bf3c7505b83ec5e6aaa20 --- M doc/examples/litecell15/lc15bts-mgr.cfg M doc/examples/litecell15/osmo-bts-lc15.cfg M doc/examples/octphy/osmo-bts-octphy.cfg M doc/examples/octphy/osmo-bts-trx2dsp1.cfg M doc/examples/sysmo/osmo-bts-sysmo.cfg M doc/examples/sysmo/sysmobts-mgr.cfg M doc/examples/trx/osmo-bts-trx-calypso.cfg M doc/examples/trx/osmo-bts-trx.cfg M doc/examples/virtual/openbsc-virtual.cfg M doc/examples/virtual/osmo-bts-virtual.cfg 10 files changed, 193 insertions(+), 193 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index e67742c..a92a3fd 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -3,41 +3,41 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level temp info - logging level fw info - logging level find info - logging level calib info - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level temp info + logging level fw info + logging level find info + logging level calib info + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice ! line vty no login ! lc15bts-mgr limits supply_volt - threshold warning min 17500 - threshold critical min 19000 + threshold warning min 17500 + threshold critical min 19000 limits tx0_vswr - threshold warning max 1000 + threshold warning max 1000 limits tx1_vswr - threshold warning max 1000 + threshold warning max 1000 limits supply_pwr - threshold warning max 110 - threshold critical max 120 + threshold warning max 110 + threshold critical max 120 limits pa0_pwr - threshold warning max 50 - threshold critical max 60 + threshold warning max 50 + threshold critical max 60 limits pa1_pwr - threshold warning max 50 - threshold critical max 60 + threshold warning max 50 + threshold critical max 60 diff --git a/doc/examples/litecell15/osmo-bts-lc15.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg index f0bafe8..907d83a 100644 --- a/doc/examples/litecell15/osmo-bts-lc15.cfg +++ b/doc/examples/litecell15/osmo-bts-lc15.cfg @@ -3,26 +3,26 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp debug - logging level abis notice - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level abis notice + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice ! line vty no login diff --git a/doc/examples/octphy/osmo-bts-octphy.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg index c729d1a..d6d03b5 100644 --- a/doc/examples/octphy/osmo-bts-octphy.cfg +++ b/doc/examples/octphy/osmo-bts-octphy.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp info - logging level abis notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice ! line vty no login diff --git a/doc/examples/octphy/osmo-bts-trx2dsp1.cfg b/doc/examples/octphy/osmo-bts-trx2dsp1.cfg index 3406e07..bf590f7 100644 --- a/doc/examples/octphy/osmo-bts-trx2dsp1.cfg +++ b/doc/examples/octphy/osmo-bts-trx2dsp1.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp info - logging level abis notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice ! line vty no login diff --git a/doc/examples/sysmo/osmo-bts-sysmo.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg index 87dfae0..6ff043d 100644 --- a/doc/examples/sysmo/osmo-bts-sysmo.cfg +++ b/doc/examples/sysmo/osmo-bts-sysmo.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp info - logging level abis notice + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice ! line vty no login diff --git a/doc/examples/sysmo/sysmobts-mgr.cfg b/doc/examples/sysmo/sysmobts-mgr.cfg index 0cb1d8c..f891ada 100644 --- a/doc/examples/sysmo/sysmobts-mgr.cfg +++ b/doc/examples/sysmo/sysmobts-mgr.cfg @@ -3,19 +3,19 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging timestamp 0 - logging level temp info - logging level fw info - logging level find info - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice + logging filter all 1 + logging color 1 + logging timestamp 0 + logging level temp info + logging level fw info + logging level find info + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice ! line vty no login diff --git a/doc/examples/trx/osmo-bts-trx-calypso.cfg b/doc/examples/trx/osmo-bts-trx-calypso.cfg index fa01953..6b52fd2 100644 --- a/doc/examples/trx/osmo-bts-trx-calypso.cfg +++ b/doc/examples/trx/osmo-bts-trx-calypso.cfg @@ -4,18 +4,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl notice - logging level oml notice - logging level rll notice - logging level rr notice - logging level meas error - logging level pag error - logging level l1c error - logging level l1p error - logging level dsp error - logging level abis error + logging color 1 + logging timestamp 0 + logging level rsl notice + logging level oml notice + logging level rll notice + logging level rr notice + logging level meas error + logging level pag error + logging level l1c error + logging level l1p error + logging level dsp error + logging level abis error ! line vty no login diff --git a/doc/examples/trx/osmo-bts-trx.cfg b/doc/examples/trx/osmo-bts-trx.cfg index 805d929..8342697 100644 --- a/doc/examples/trx/osmo-bts-trx.cfg +++ b/doc/examples/trx/osmo-bts-trx.cfg @@ -3,18 +3,18 @@ !! ! log stderr - logging color 1 - logging timestamp 0 - logging level rsl notice - logging level oml notice - logging level rll notice - logging level rr notice - logging level meas error - logging level pag error - logging level l1c error - logging level l1p error - logging level dsp error - logging level abis error + logging color 1 + logging timestamp 0 + logging level rsl notice + logging level oml notice + logging level rll notice + logging level rr notice + logging level meas error + logging level pag error + logging level l1c error + logging level l1p error + logging level dsp error + logging level abis error ! line vty no login diff --git a/doc/examples/virtual/openbsc-virtual.cfg b/doc/examples/virtual/openbsc-virtual.cfg index 8044fa8..be79d58 100644 --- a/doc/examples/virtual/openbsc-virtual.cfg +++ b/doc/examples/virtual/openbsc-virtual.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all info - logging level rll notice - logging level cc notice - logging level mm debug - logging level rr notice - logging level rsl notice - logging level nm info - logging level mncc notice - logging level pag notice - logging level meas notice - logging level sccp notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level db notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level llc debug - logging level sndcp debug - logging level nat notice - logging level ctrl notice - logging level smpp debug - logging level filter debug - logging level ranap debug - logging level sua debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all info + logging level rll notice + logging level cc notice + logging level mm debug + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level filter debug + logging level ranap debug + logging level sua debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice ! stats interval 5 ! diff --git a/doc/examples/virtual/osmo-bts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg index fa22316..dbdc22f 100644 --- a/doc/examples/virtual/osmo-bts-virtual.cfg +++ b/doc/examples/virtual/osmo-bts-virtual.cfg @@ -3,36 +3,36 @@ !! ! log stderr - logging filter all 0 - logging color 0 - logging print category 1 - logging timestamp 0 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp error - logging level pcu notice - logging level ho debug - logging level trx notice - logging level loop notice - logging level abis debug - logging level rtp notice - logging level sum error - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats error + logging filter all 0 + logging color 0 + logging print category 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp error + logging level pcu notice + logging level ho debug + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum error + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats error ! line vty no login -- To view, visit https://gerrit.osmocom.org/11085 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: I3da56b34e87503c46e6bf3c7505b83ec5e6aaa20 Gerrit-Change-Number: 11085 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 Tue Sep 25 18:55:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:55:21 +0000 Subject: Change in osmo-bts[master]: lc15bts_mgr_vty: Ensure writing well-formed config files Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11094 Change subject: lc15bts_mgr_vty: Ensure writing well-formed config files ...................................................................... lc15bts_mgr_vty: Ensure writing well-formed config files Every new node level should only add one additional space, not two! Change-Id: Ic890429a6ff1e0c89fe1c6a159c6ee6ecbcf9a5a --- M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/11094/1 diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c index e1ddfc7..80751fb 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c @@ -251,9 +251,9 @@ struct lc15bts_volt_limit *limit) { vty_out(vty, " %s%s", name, VTY_NEWLINE); - vty_out(vty, " threshold warning min %d%s", + vty_out(vty, " threshold warning min %d%s", limit->thresh_warn_min, VTY_NEWLINE); - vty_out(vty, " threshold critical min %d%s", + vty_out(vty, " threshold critical min %d%s", limit->thresh_crit_min, VTY_NEWLINE); } @@ -261,7 +261,7 @@ struct lc15bts_vswr_limit *limit) { vty_out(vty, " %s%s", name, VTY_NEWLINE); - vty_out(vty, " threshold warning max %d%s", + vty_out(vty, " threshold warning max %d%s", limit->thresh_warn_max, VTY_NEWLINE); } @@ -269,9 +269,9 @@ struct lc15bts_pwr_limit *limit) { vty_out(vty, " %s%s", name, VTY_NEWLINE); - vty_out(vty, " threshold warning max %d%s", + vty_out(vty, " threshold warning max %d%s", limit->thresh_warn_max, VTY_NEWLINE); - vty_out(vty, " threshold critical max %d%s", + vty_out(vty, " threshold critical max %d%s", limit->thresh_crit_max, VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/11094 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: Ic890429a6ff1e0c89fe1c6a159c6ee6ecbcf9a5a Gerrit-Change-Number: 11094 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 18:56:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:56:00 +0000 Subject: Change in osmo-bts[master]: lc15bts_mgr_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11094 ) Change subject: lc15bts_mgr_vty: Ensure writing well-formed config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11094 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: Ic890429a6ff1e0c89fe1c6a159c6ee6ecbcf9a5a Gerrit-Change-Number: 11094 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 18:56: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 Sep 25 18:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 18:56:36 +0000 Subject: Change in docker-playground[master]: ensure well-formed config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11093 ) Change subject: ensure well-formed config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11093 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: Id687e63c418e2e955ccbb92f2420a80fc0704ea4 Gerrit-Change-Number: 11093 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 25 Sep 2018 18:56:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 19:32:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 19:32:48 +0000 Subject: Change in osmo-bts[master]: lc15bts_mgr_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11094 ) Change subject: lc15bts_mgr_vty: Ensure writing well-formed config files ...................................................................... lc15bts_mgr_vty: Ensure writing well-formed config files Every new node level should only add one additional space, not two! Change-Id: Ic890429a6ff1e0c89fe1c6a159c6ee6ecbcf9a5a --- M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c index e1ddfc7..80751fb 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c @@ -251,9 +251,9 @@ struct lc15bts_volt_limit *limit) { vty_out(vty, " %s%s", name, VTY_NEWLINE); - vty_out(vty, " threshold warning min %d%s", + vty_out(vty, " threshold warning min %d%s", limit->thresh_warn_min, VTY_NEWLINE); - vty_out(vty, " threshold critical min %d%s", + vty_out(vty, " threshold critical min %d%s", limit->thresh_crit_min, VTY_NEWLINE); } @@ -261,7 +261,7 @@ struct lc15bts_vswr_limit *limit) { vty_out(vty, " %s%s", name, VTY_NEWLINE); - vty_out(vty, " threshold warning max %d%s", + vty_out(vty, " threshold warning max %d%s", limit->thresh_warn_max, VTY_NEWLINE); } @@ -269,9 +269,9 @@ struct lc15bts_pwr_limit *limit) { vty_out(vty, " %s%s", name, VTY_NEWLINE); - vty_out(vty, " threshold warning max %d%s", + vty_out(vty, " threshold warning max %d%s", limit->thresh_warn_max, VTY_NEWLINE); - vty_out(vty, " threshold critical max %d%s", + vty_out(vty, " threshold critical max %d%s", limit->thresh_crit_max, VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/11094 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: Ic890429a6ff1e0c89fe1c6a159c6ee6ecbcf9a5a Gerrit-Change-Number: 11094 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 Tue Sep 25 19:34:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 19:34:30 +0000 Subject: Change in libosmocore[master]: logging_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11086 ) Change subject: logging_vty: Ensure writing well-formed config files ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11086 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: Ia75c7067284ea225cffe13ca71bad05a7747ae66 Gerrit-Change-Number: 11086 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 19:34: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 Sep 25 19:34:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 19:34:36 +0000 Subject: Change in libosmocore[master]: Add new osmo-config-merge utility In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11084 ) Change subject: Add new osmo-config-merge utility ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11084 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: I61997a3668cc3a40d12ca023272f6d782e6fbefe Gerrit-Change-Number: 11084 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 19:34:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 19:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 19:34:41 +0000 Subject: Change in libosmocore[master]: Add new osmo-config-merge utility In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11084 ) Change subject: Add new osmo-config-merge utility ...................................................................... Add new osmo-config-merge utility This utility allows you to merge an incremental config "patch" into an osmocom-style config file. The patch file follows the same syntax as the original config file. It works by appending the leaf nodes of the patch file to the respective nodes of the input config file. This process allows configuration file changes/updates to be performed in a more stable/reliable way than by means of [unified] diff files, as they break every time the context lines break. osmo-config-merge doesn't suffer from this problem, as it understands the tree-like nature of VTY config files. NITE: This only works with configuration files that have proper indenting, i.e. every level in the hierarchy must be indented excatly one character, not multiple. Change-Id: I61997a3668cc3a40d12ca023272f6d782e6fbefe --- M .gitignore M debian/control M debian/libosmocore-utils.install M utils/Makefile.am A utils/osmo-config-merge.c 5 files changed, 275 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 369277c..451c883 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ utils/osmo-arfcn utils/osmo-auc-gen +utils/osmo-config-merge utils/osmo-sim-test doc/codec diff --git a/debian/control b/debian/control index 540a8b5..33ae2d4 100644 --- a/debian/control +++ b/debian/control @@ -315,7 +315,8 @@ Description: Utilities for gsm This package contains a program for frequency calculation for GSM called 'osmo-arfcn' and a program called 'osmo-auc-gen' that is used for testing GSM - authentication. + authentication, as well as 'osmo-config-merge', a tool for merging Osmocom + configuration files. . They use the libosmocore library. The libosmocore library contain various utility functions that were originally developed as part of the OpenBSC diff --git a/debian/libosmocore-utils.install b/debian/libosmocore-utils.install index 9c3b8dc..d23cc73 100644 --- a/debian/libosmocore-utils.install +++ b/debian/libosmocore-utils.install @@ -1,2 +1,3 @@ usr/bin/osmo-arfcn usr/bin/osmo-auc-gen +usr/bin/osmo-config-merge diff --git a/utils/Makefile.am b/utils/Makefile.am index d4999bd..fb79190 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -5,12 +5,16 @@ EXTRA_DIST = conv_gen.py conv_codes_gsm.py -bin_PROGRAMS = osmo-arfcn osmo-auc-gen +bin_PROGRAMS = osmo-arfcn osmo-auc-gen osmo-config-merge osmo_arfcn_SOURCES = osmo-arfcn.c osmo_auc_gen_SOURCES = osmo-auc-gen.c +osmo_config_merge_SOURCES = osmo-config-merge.c +osmo_config_merge_LDADD = $(LDADD) $(TALLOC_LIBS) +osmo_config_merge_CFLAGS = $(TALLOC_CFLAGS) + if ENABLE_PCSC noinst_PROGRAMS = osmo-sim-test osmo_sim_test_SOURCES = osmo-sim-test.c diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c new file mode 100644 index 0000000..131486c --- /dev/null +++ b/utils/osmo-config-merge.c @@ -0,0 +1,266 @@ +/*! \file osmo-config-merge.c + * Utility program for merging config files with patches */ +/* + * (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. + * + */ + +/* + This utility allows you to merge an incremental config "patch" + into an osmocom-style config file. + + The patch file follows the same syntax as the original config file. + + It works by appending the leaf nodes of the patch file to the respective + nodes of the input config file. + + This process allows configuration file changes/updates to be performed + in a more stable/reliable way than by means of [unified] diff files, + as they break every time the context lines break. + + osmo-config-merge doesn't suffer from this problem, as it understands + the tree-like nature of VTY config files. + + NITE: This only works with configuration files that have proper + indenting, i.e. every level in the hierarchy must be indented excatly + one character, not multiple. + */ + +#include +#include + +#include +#include +#include + +struct node { + struct node *parent; /* back-pointer */ + struct llist_head list; /* part of parent->children */ + struct llist_head children; /* our own children */ + char *line; +}; + +/* allocate a new node */ +static struct node *node_alloc(void *ctx) +{ + struct node *node = talloc_zero(ctx, struct node); + OSMO_ASSERT(node); + INIT_LLIST_HEAD(&node->children); + return node; +} + +/* allocate a new node as child of given parent */ +static struct node *node_alloc_child(struct node *parent) +{ + struct node *node = node_alloc(parent); + node->parent = parent; + llist_add_tail(&node->list, &parent->children); + return node; +} + +/* find a given child specified by name/line string within given parent */ +static struct node *node_find_child(struct node *parent, const char *line) +{ + struct node *n; + + llist_for_each_entry(n, &parent->children, list) { + if (!strcmp(line, n->line)) + return n; + } + return NULL; +} + +/* count the number of spaces / indent level */ +static int count_indent(const char *line) +{ + int i; + + for (i = 0; i < strlen(line); i++) { + if (line[i] != ' ') + return i; + } + return i; +} + +/* strip any triling CR / LF */ +static void chomp(char *line) +{ + while (1) { + int len = strlen(line); + if (len == 0) + return; + char *lastch = &line[len-1]; + switch (*lastch) { + case '\n': + case '\r': + *lastch = '\0'; + default: + return; + } + } +} + +/* read a config file and parse it into a tree of nodes */ +static struct node *file_read(void *ctx, const char *fname) +{ + struct node *root, *last; + FILE *infile; + char line[1024]; + int cur_indent = -1; + unsigned int line_num = 0; + + infile = fopen(fname, "r"); + if (!infile) + return NULL; + + root = node_alloc(ctx); + last = root; + while (fgets(line, sizeof(line), infile)) { + line_num++; + chomp(line); + int indent = count_indent(line); + struct node *n; + if (indent > cur_indent) { + if (indent > cur_indent+1) { + fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", + fname, line_num); + exit(2); + } + /* new child to last node */ + n = node_alloc_child(last); + } else if (indent < cur_indent) { + for (int i = 0; i < cur_indent - indent; i++) { + /* go to parent, add another sibling */ + if (last->parent) + last = last->parent; + } + n = node_alloc_child(last->parent); + } else { + /* add a new sibling (child of parent) */ + n = node_alloc_child(last->parent); + } + n->line = talloc_strdup(n, line); + + last = n; + cur_indent = indent; + } + + return root; +} + +static void append_patch(struct node *cfg, struct node *patch) +{ + struct node *n; + + llist_for_each_entry(n, &patch->children, list) { + if (llist_empty(&n->children)) { + struct node *t; + /* we are an end-node, i.e. something that needs to be + * patched into the original tree. We do this by simply + * appending it to the list of siblings */ + t = node_alloc_child(cfg); + t->line = talloc_strdup(t, n->line); + } else { + struct node *c; + /* we need to iterate / recurse further */ + + /* try to find the matching original node */ + c = node_find_child(cfg, n->line); + if (!c) { + /* create it, if it's missing */ + c = node_alloc_child(cfg); + c->line = talloc_strdup(c, n->line); + } + append_patch(c, n); + } + } +} + + +static int level = -1; + +static void dump_node(struct node *root, FILE *out, bool print_node_depth) +{ + struct node *n; + level++; + + if (root->line) { + if (print_node_depth) { + for (int i = 0; i < level; i++) + fputc('*', out); + } + + fprintf(out, "%s\n", root->line); + } + + llist_for_each_entry(n, &root->children, list) { + dump_node(n, out, print_node_depth); + } + level--; +} + +static void exit_usage(int rc) +{ + fprintf(stderr, "Usage: osmo-config-merge [--debug]\n"); + exit(rc); +} + + +int main(int argc, char **argv) +{ + const char *base_fname, *patch_fname; + struct node *base_tree, *patch_tree; + bool debug_enabled = false; + + void *ctx = talloc_named_const(NULL, 0, "root"); + + if (argc < 3) + exit_usage(1); + + base_fname = argv[1]; + patch_fname = argv[2]; + + if (argc > 3) { + if (!strcmp(argv[3], "--debug")) + debug_enabled = true; + else + exit_usage(1); + } + + base_tree = file_read(ctx, base_fname); + patch_tree = file_read(ctx, patch_fname); + + if (debug_enabled) { + fprintf(stderr, "====== dumping tree (base)\n"); + dump_node(base_tree, stderr, true); + fprintf(stderr, "====== dumping tree (patch)\n"); + dump_node(patch_tree, stderr, true); + } + + append_patch(base_tree, patch_tree); + + if (debug_enabled) + fprintf(stderr, "====== dumping tree (patched)\n"); + dump_node(base_tree, stdout, false); + fflush(stdout); + + /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */ + talloc_free(patch_tree); + talloc_free(base_tree); +} -- To view, visit https://gerrit.osmocom.org/11084 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: I61997a3668cc3a40d12ca023272f6d782e6fbefe Gerrit-Change-Number: 11084 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 Tue Sep 25 19:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 19:34:41 +0000 Subject: Change in libosmocore[master]: logging_vty: Ensure writing well-formed config files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11086 ) Change subject: logging_vty: Ensure writing well-formed config files ...................................................................... logging_vty: Ensure writing well-formed config files We want to have well-formed config files that print exactly one space per VTY/config node level, and not two. Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66 --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 15 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index b2637a5..31edb52 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -890,24 +890,24 @@ break; } - vty_out(vty, " logging filter all %u%s", + vty_out(vty, " logging filter all %u%s", tgt->filter_map & (1 << LOG_FLT_ALL) ? 1 : 0, VTY_NEWLINE); /* save filters outside of libosmocore, i.e. in app code */ if (osmo_log_info->save_fn) osmo_log_info->save_fn(vty, osmo_log_info, tgt); - vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0, + vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0, VTY_NEWLINE); - vty_out(vty, " logging print category %d%s", + vty_out(vty, " logging print category %d%s", tgt->print_category ? 1 : 0, VTY_NEWLINE); if (tgt->print_ext_timestamp) - vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE); + vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE); else - vty_out(vty, " logging timestamp %u%s", + vty_out(vty, " logging timestamp %u%s", tgt->print_timestamp ? 1 : 0, VTY_NEWLINE); if (tgt->print_level) - vty_out(vty, " logging print level 1%s", VTY_NEWLINE); - vty_out(vty, " logging print file %s%s", + vty_out(vty, " logging print level 1%s", VTY_NEWLINE); + vty_out(vty, " logging print file %s%s", get_value_string(logging_print_file_args, tgt->print_filename2), VTY_NEWLINE); @@ -918,7 +918,7 @@ vty_out(vty, "%% Invalid log level %u for 'force-all'%s", tgt->loglevel, VTY_NEWLINE); else - vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); + vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); } for (i = 0; i < osmo_log_info->num_cat; i++) { @@ -941,7 +941,7 @@ continue; } - vty_out(vty, " logging level %s", cat_name); + vty_out(vty, " logging level %s", cat_name); vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE); } diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index 0c552a5..0eedbe3 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -4,11 +4,11 @@ ... log stderr ... !logging level all - logging level aa debug - logging level bb info - logging level ccc notice - logging level dddd error - logging level eee fatal + logging level aa debug + logging level bb info + logging level ccc notice + logging level dddd error + logging level eee fatal ... logging_vty_test# configure terminal @@ -17,7 +17,7 @@ logging_vty_test(config-log)# logging level force-all notice logging_vty_test(config-log)# show running-config ... !logging level all - logging level force-all notice + logging level force-all notice ... !logging level all logging_vty_test(config-log)# no logging level force-all -- To view, visit https://gerrit.osmocom.org/11086 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: Ia75c7067284ea225cffe13ca71bad05a7747ae66 Gerrit-Change-Number: 11086 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 jenkins at lists.osmocom.org Tue Sep 25 19:42:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:42:21 +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_#5782?= Message-ID: <1796308876.286.1537904541089.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 33.54 KB...] CC apn.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsup.lo 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 CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_mapping.lo CC gsm0503_interleaving.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_bssgp_util.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_usim.lo CC card_fs_sim.lo CC reader_pcsc.lo CC card_fs_uicc.lo CC class_tables.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:902: 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 Tue Sep 25 19:42:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:42:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5782?= Message-ID: <2043622149.287.1537904543431.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 32.78 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_mapping.lo CC gsm0503_interleaving.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-auc-gen.o CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:42:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:42:43 +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_#1517?= Message-ID: <2099689539.288.1537904563025.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 33.29 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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-enc.lo CC milenage/aes-internal.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_util.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_vty.lo CC control_if.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_sim.lo CC reader_pcsc.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' make[1]: *** [install-recursive] Error 1 Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:902: 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 Tue Sep 25 19:42:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:42:43 +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_#1517?= Message-ID: <136221800.289.1537904563332.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 33.28 KB...] ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsm0341.lo CC apn.lo CC gsup.lo 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 CC milenage/aes-internal.lo CC milenage/milenage.lo CC milenage/aes-internal-enc.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_ns_frgre.lo CC gprs_ns.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_vty.lo CC control_if.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:42:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:42:49 +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_#5783?= In-Reply-To: <1796308876.286.1537904541089.JavaMail.jenkins@jenkins.osmocom.org> References: <1796308876.286.1537904541089.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <427113955.290.1537904569193.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 34.26 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_uicc.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:43:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:43:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5783?= In-Reply-To: <2043622149.287.1537904543431.JavaMail.jenkins@jenkins.osmocom.org> References: <2043622149.287.1537904543431.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1412447556.291.1537904587322.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 33.48 KB...] CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsup.lo 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CC gsm0503_tables.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_vty.lo CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC reader_pcsc.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CC osmo-auc-gen.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:43:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:43:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1315?= Message-ID: <2111052296.292.1537904605042.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 150.45 KB...] KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g none OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g ? none Delete 3G authentication data milenage Use Milenage algorithm OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ? k Set Encryption Key K OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k ? K K as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d ? op Set OP key opc Set OPC key OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc ? OP_C OP or OPC as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ? [ind-bitlen] Set IND bit length OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen ? [<0-28>] IND bit length value (default: 5) OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=deafbeddedbabeacceededfadeddecaf IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' OsmoHLR# subscriber imsi 123456789023000 show 20180925194324808 DAUC ERROR Cannot read subscriber from db: IMSI='123456789023000': No such subscriber (db_hlr.c:456) % No subscriber for imsi = '123456789023000' OsmoHLR# subscriber id 1 show 20180925194324808 DAUC ERROR Cannot read subscriber from db: ID=1: No such subscriber (db_hlr.c:504) % No subscriber for id = '1' OsmoHLR# subscriber msisdn 423 show 20180925194324808 DAUC ERROR Cannot read subscriber from db: MSISDN='423': No such subscriber (db_hlr.c:480) % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 ID: 1 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' RESULTS: FAIL: ./test_nodes.vty pass: ./test_subscriber.vty Makefile:700: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 1 make[6]: Leaving directory ' Makefile:691: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory ' Makefile:723: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory ' Makefile:550: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:402: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory ' Makefile:479: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:770: 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 jenkins at lists.osmocom.org Tue Sep 25 19:46:10 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:46:10 +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_#5941?= Message-ID: <745019922.293.1537904770857.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 35.68 KB...] CC apn.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsup.lo 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 CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_mapping.lo CC gsm0503_interleaving.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC reader_pcsc.lo CC core.lo CC card_fs_sim.lo CC class_tables.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: Leaving directory '/build/deps/libosmocore/utils' make[1]: *** [install-recursive] Error 1 Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:46:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:46:22 +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_#5941?= Message-ID: <560104388.294.1537904782957.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 35.18 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_usim.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:902: 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 Tue Sep 25 19:46:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:46:36 +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_#5784?= In-Reply-To: <427113955.290.1537904569193.JavaMail.jenkins@jenkins.osmocom.org> References: <427113955.290.1537904569193.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <394781428.295.1537904796963.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 42.54 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CC gprs_bssgp.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_sim.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:46:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:46:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5784?= In-Reply-To: <1412447556.291.1537904587322.JavaMail.jenkins@jenkins.osmocom.org> References: <1412447556.291.1537904587322.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1411573618.296.1537904809281.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 41.79 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_mapping.lo CC gsm0503_interleaving.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp_util.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC card_fs_sim.lo CC core.lo CC reader_pcsc.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' make[1]: *** [install-recursive] Error 1 Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:46:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:46:51 +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_#2832?= Message-ID: <466752586.297.1537904811377.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 39.16 KB...] CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsup.lo 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_coding.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_bss.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC common_vty.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC class_tables.lo CC reader_pcsc.lo CC reader.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:902: 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 Tue Sep 25 19:46:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:46:57 +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_#2832?= Message-ID: <1288844976.298.1537904817536.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 39.10 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC reader_pcsc.lo CC card_fs_sim.lo CC class_tables.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CC osmo-auc-gen.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:902: recipe for target 'install' failed make[1]: *** [install-recursive] Error 1 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 Tue Sep 25 19:47:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:47:09 +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_#3593?= Message-ID: <1155109822.299.1537904829972.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 34.50 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_tables.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_bssgp.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_sim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: Leaving directory '/build/deps/libosmocore/utils' make[1]: *** [install-recursive] Error 1 Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:902: 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 Tue Sep 25 19:54:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:54:11 +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_#5942?= In-Reply-To: <560104388.294.1537904782957.JavaMail.jenkins@jenkins.osmocom.org> References: <560104388.294.1537904782957.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1827164315.303.1537905251552.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 35.87 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC common_vty.lo CC gprs_ns_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:902: 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 Tue Sep 25 19:54:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:54:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5785?= In-Reply-To: <1411573618.296.1537904809281.JavaMail.jenkins@jenkins.osmocom.org> References: <1411573618.296.1537904809281.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <544880461.300.1537905248216.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 42.46 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC fsm_ctrl_commands.lo CC control_if.lo CC control_cmd.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader_pcsc.lo CC class_tables.lo CC reader.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:54:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:54:09 +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_#5942?= In-Reply-To: <745019922.293.1537904770857.JavaMail.jenkins@jenkins.osmocom.org> References: <745019922.293.1537904770857.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1112998562.301.1537905249460.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.35 KB...] CC gan.lo CC ipa.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsm0341.lo CC apn.lo CC gsup.lo 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CC gsm0503_tables.lo CC gsm0503_interleaving.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_vty.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CC control_cmd.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: 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 Sep 25 19:54:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 19:54:09 +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_#5785?= In-Reply-To: <394781428.295.1537904796963.JavaMail.jenkins@jenkins.osmocom.org> References: <394781428.295.1537904796963.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <504012443.302.1537905249625.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 43.21 KB...] CC ipa.lo CC gan.lo CC gsm0341.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC apn.lo CC gsup.lo 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CC gsm0503_tables.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_bssgp_util.lo CC gprs_ns_frgre.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 '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:902: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From admin at opensuse.org Tue Sep 25 19:54:05 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 25 Sep 2018 19:54:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5baa925fa2a21_15a410f268886774@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 220s] for (int i = 0; i < level; i++) [ 220s] ^ [ 220s] osmo-config-merge.c: In function 'main': [ 220s] osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] [ 220s] } [ 220s] ^ [ 220s] Makefile:515: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed [ 220s] make[3]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 [ 220s] make[3]: Leaving directory '/usr/src/packages/BUILD/utils' [ 220s] Makefile:603: recipe for target 'all-recursive' failed [ 220s] make[2]: *** [all-recursive] Error 1 [ 220s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 220s] Makefile:406: recipe for target 'all' failed [ 220s] make[1]: *** [all] Error 2 [ 220s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 220s] dh_auto_build: make -j1 returned exit code 2 [ 220s] debian/rules:15: recipe for target 'build' failed [ 220s] make: *** [build] Error 2 [ 220s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 220s] [ 220s] cloud108 failed "build libosmocore_0.12.0.69.0d67.dsc" at Tue Sep 25 19:54:01 UTC 2018. [ 220s] [ 220s] ### VM INTERACTION START ### [ 221s] Powering off. [ 221s] [ 196.036448] reboot: Power down [ 222s] ### VM INTERACTION END ### [ 222s] [ 222s] cloud108 failed "build libosmocore_0.12.0.69.0d67.dsc" at Tue Sep 25 19:54:04 UTC 2018. [ 222s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Sep 25 19:55:13 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 25 Sep 2018 19:55:13 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5baa92ba5ba1a_15a410f2688870d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 254s] for (int i = 0; i < level; i++) [ 254s] ^ [ 254s] osmo-config-merge.c: In function 'main': [ 254s] osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] [ 254s] } [ 254s] ^ [ 254s] Makefile:515: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed [ 254s] make[3]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 [ 254s] make[3]: Leaving directory '/usr/src/packages/BUILD/utils' [ 254s] Makefile:603: recipe for target 'all-recursive' failed [ 254s] make[2]: *** [all-recursive] Error 1 [ 254s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 254s] Makefile:406: recipe for target 'all' failed [ 254s] make[1]: *** [all] Error 2 [ 254s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 254s] dh_auto_build: make -j1 returned exit code 2 [ 254s] debian/rules:15: recipe for target 'build' failed [ 254s] make: *** [build] Error 2 [ 254s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 254s] [ 254s] cloud108 failed "build libosmocore_0.12.0.69.0d67.dsc" at Tue Sep 25 19:55:05 UTC 2018. [ 254s] [ 254s] ### VM INTERACTION START ### [ 255s] Powering off. [ 255s] [ 215.743201] reboot: Power down [ 256s] ### VM INTERACTION END ### [ 256s] [ 256s] cloud108 failed "build libosmocore_0.12.0.69.0d67.dsc" at Tue Sep 25 19:55:08 UTC 2018. [ 256s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue Sep 25 20:42:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 20:42:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5786?= In-Reply-To: <544880461.300.1537905248216.JavaMail.jenkins@jenkins.osmocom.org> References: <544880461.300.1537905248216.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1235530718.306.1537908167319.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 32.11 KB...] 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 (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_bssgp.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CC osmo_config_merge-osmo-config-merge.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/utils' make[1]: *** [install-recursive] Error 1 Makefile:603: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:902: 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 Sep 25 20:42:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 20:42:50 +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_#5786?= In-Reply-To: <504012443.302.1537905249625.JavaMail.jenkins@jenkins.osmocom.org> References: <504012443.302.1537905249625.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1435798953.307.1537908170989.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 40.58 KB...] CC gan.lo CC ipa.lo CC gsm0341.lo CC gsup.lo CC apn.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ 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 CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' 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 '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC common_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_isim.lo CC card_fs_sim.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_sim_test-osmo-sim-test.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o osmo-config-merge.c: In function 'file_read': osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code osmo-config-merge.c: In function 'dump_node': osmo-config-merge.c:205:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < level; i++) ^ osmo-config-merge.c: In function 'main': osmo-config-merge.c:266:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ make[2]: *** [osmo_config_merge-osmo-config-merge.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:511: recipe for target 'osmo_config_merge-osmo-config-merge.o' failed make[2]: Leaving directory '/build/deps/libosmocore/utils' Makefile:603: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:902: 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 Tue Sep 25 20:52:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 20:52:34 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Don't use C99 'for' loop initial declarations Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11095 Change subject: osmo-config-merge: Don't use C99 'for' loop initial declarations ...................................................................... osmo-config-merge: Don't use C99 'for' loop initial declarations The existing code passed gerrit build verification but failed the master builds with the following error: osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code Change-Id: Ia29e85b648c1a427be88242306634efe890e250d --- M utils/osmo-config-merge.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/11095/1 diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index 131486c..3762c67 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -145,7 +145,8 @@ /* new child to last node */ n = node_alloc_child(last); } else if (indent < cur_indent) { - for (int i = 0; i < cur_indent - indent; i++) { + int i; + for (i = 0; i < cur_indent - indent; i++) { /* go to parent, add another sibling */ if (last->parent) last = last->parent; @@ -202,7 +203,8 @@ if (root->line) { if (print_node_depth) { - for (int i = 0; i < level; i++) + int i; + for (i = 0; i < level; i++) fputc('*', out); } -- To view, visit https://gerrit.osmocom.org/11095 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: Ia29e85b648c1a427be88242306634efe890e250d Gerrit-Change-Number: 11095 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 25 20:56:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 20:56:31 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Don't use C99 'for' loop initial declarations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11095 ) Change subject: osmo-config-merge: Don't use C99 'for' loop initial declarations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11095 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: Ia29e85b648c1a427be88242306634efe890e250d Gerrit-Change-Number: 11095 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 25 Sep 2018 20:56: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 Sep 25 20:56:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 25 Sep 2018 20:56:33 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Don't use C99 'for' loop initial declarations In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11095 ) Change subject: osmo-config-merge: Don't use C99 'for' loop initial declarations ...................................................................... osmo-config-merge: Don't use C99 'for' loop initial declarations The existing code passed gerrit build verification but failed the master builds with the following error: osmo-config-merge.c:148:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (int i = 0; i < cur_indent - indent; i++) { ^ osmo-config-merge.c:148:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code Change-Id: Ia29e85b648c1a427be88242306634efe890e250d --- M utils/osmo-config-merge.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index 131486c..3762c67 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -145,7 +145,8 @@ /* new child to last node */ n = node_alloc_child(last); } else if (indent < cur_indent) { - for (int i = 0; i < cur_indent - indent; i++) { + int i; + for (i = 0; i < cur_indent - indent; i++) { /* go to parent, add another sibling */ if (last->parent) last = last->parent; @@ -202,7 +203,8 @@ if (root->line) { if (print_node_depth) { - for (int i = 0; i < level; i++) + int i; + for (i = 0; i < level; i++) fputc('*', out); } -- To view, visit https://gerrit.osmocom.org/11095 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: Ia29e85b648c1a427be88242306634efe890e250d Gerrit-Change-Number: 11095 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 Tue Sep 25 21:08:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:08:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1316?= In-Reply-To: <2111052296.292.1537904605042.JavaMail.jenkins@jenkins.osmocom.org> References: <2111052296.292.1537904605042.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1786043557.308.1537909685948.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 150.48 KB...] KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g none OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g ? none Delete 3G authentication data milenage Use Milenage algorithm OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ? k Set Encryption Key K OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k ? K K as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d ? op Set OP key opc Set OPC key OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc ? OP_C OP or OPC as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ? [ind-bitlen] Set IND bit length OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen ? [<0-28>] IND bit length value (default: 5) OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=deafbeddedbabeacceededfadeddecaf IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' OsmoHLR# subscriber imsi 123456789023000 show 20180925210805692 DAUC ERROR Cannot read subscriber from db: IMSI='123456789023000': No such subscriber (db_hlr.c:456) % No subscriber for imsi = '123456789023000' OsmoHLR# subscriber id 1 show 20180925210805692 DAUC ERROR Cannot read subscriber from db: ID=1: No such subscriber (db_hlr.c:504) % No subscriber for id = '1' OsmoHLR# subscriber msisdn 423 show 20180925210805692 DAUC ERROR Cannot read subscriber from db: MSISDN='423': No such subscriber (db_hlr.c:480) % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 ID: 1 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' RESULTS: FAIL: ./test_nodes.vty pass: ./test_subscriber.vty Makefile:700: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 1 make[6]: Leaving directory ' Makefile:691: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory ' Makefile:723: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory ' Makefile:550: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:402: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory ' Makefile:479: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:770: 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 jenkins at lists.osmocom.org Tue Sep 25 21:08:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:08:45 +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_#5787?= In-Reply-To: <1235530718.306.1537908167319.JavaMail.jenkins@jenkins.osmocom.org> References: <1235530718.306.1537908167319.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1983087368.309.1537909725080.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:09:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:09:23 +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_#1518?= In-Reply-To: <2099689539.288.1537904563025.JavaMail.jenkins@jenkins.osmocom.org> References: <2099689539.288.1537904563025.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <772466742.310.1537909763185.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:09:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:09:30 +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_#1518?= In-Reply-To: <136221800.289.1537904563332.JavaMail.jenkins@jenkins.osmocom.org> References: <136221800.289.1537904563332.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1128761353.311.1537909770067.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:10:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:10:21 +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_#5787?= In-Reply-To: <1435798953.307.1537908170989.JavaMail.jenkins@jenkins.osmocom.org> References: <1435798953.307.1537908170989.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1296184987.312.1537909821392.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:13:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:13:43 +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_#5943?= In-Reply-To: <1112998562.301.1537905249460.JavaMail.jenkins@jenkins.osmocom.org> References: <1112998562.301.1537905249460.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <423797001.313.1537910023809.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:13:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:13:44 +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_#5943?= In-Reply-To: <1827164315.303.1537905251552.JavaMail.jenkins@jenkins.osmocom.org> References: <1827164315.303.1537905251552.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1237504748.314.1537910024621.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:13:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:13:49 +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_#3594?= In-Reply-To: <1155109822.299.1537904829972.JavaMail.jenkins@jenkins.osmocom.org> References: <1155109822.299.1537904829972.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <866404070.315.1537910029502.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:17:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:17:27 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_?= =?UTF-8?Q?master,osmocom-master-debian9,lc15,True_#842?= Message-ID: <797714857.316.1537910247720.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 26.83 KB...] 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... 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 to enable VTY/CTRL tests... no 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 configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.70-eda6 > .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/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.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_gettimeofday.lo CC timer.lo CC timer_clockgettime.lo CC select.lo CC signal.lo CC msgb.lo CC bits.lo CC bitvec.lo /bin/bash: line 2: 20410 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 timer_clockgettime.lo -MD -MP -MF $depbase.Tpo -c -o timer_clockgettime.lo timer_clockgettime.c Makefile:558: recipe for target 'timer_clockgettime.lo' failed make[3]: *** [timer_clockgettime.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: 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 Tue Sep 25 21:17:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:17:41 +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_#2833?= In-Reply-To: <466752586.297.1537904811377.JavaMail.jenkins@jenkins.osmocom.org> References: <466752586.297.1537904811377.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1040021426.317.1537910261479.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Sep 25 21:17:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Sep 2018 21:17:47 +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_#2833?= In-Reply-To: <1288844976.298.1537904817536.JavaMail.jenkins@jenkins.osmocom.org> References: <1288844976.298.1537904817536.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <209645454.318.1537910267577.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Sep 26 00:04:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 26 Sep 2018 00:04:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1317?= In-Reply-To: <1786043557.308.1537909685948.JavaMail.jenkins@jenkins.osmocom.org> References: <1786043557.308.1537909685948.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1543029206.319.1537920282769.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 150.38 KB...] KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber msisdn 423 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee % Unknown command. OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX' OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v3 KI=c01ffedc1cadaeac1d1f1edacac1ab0a OsmoHLR# subscriber id 1 update aud2g none OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g ? none Delete 3G authentication data milenage Use Milenage algorithm OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ? k Set Encryption Key K OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k ? K K as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d ? op Set OP key opc Set OPC key OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc ? OP_C OP or OPC as 32 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ? [ind-bitlen] Set IND bit length OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen ? [<0-28>] IND bit length value (default: 5) OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=deafbeddedbabeacceededfadeddecaf IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 update aud3g none OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23 OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef % Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OPC=cededeffacedacefacedbadfadedbeef IND-bitlen=23 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op C01ffedC1cadaeAc1d1f1edAcac1aB0a OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa % Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa' OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 MSISDN: 423 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef OsmoHLR# subscriber id 1 show ID: 1 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v2 KI=cededeffacedacefacedbadfadedbeef 3G auth: MILENAGE K=deaf0ff1ced0d0dabbedd1ced1cef00d OP=c01ffedc1cadaeac1d1f1edacac1ab0a IND-bitlen=5 OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' OsmoHLR# subscriber imsi 123456789023000 show 20180926000442539 DAUC ERROR Cannot read subscriber from db: IMSI='123456789023000': No such subscriber (db_hlr.c:456) % No subscriber for imsi = '123456789023000' OsmoHLR# subscriber id 1 show 20180926000442539 DAUC ERROR Cannot read subscriber from db: ID=1: No such subscriber (db_hlr.c:504) % No subscriber for id = '1' OsmoHLR# subscriber msisdn 423 show 20180926000442539 DAUC ERROR Cannot read subscriber from db: MSISDN='423': No such subscriber (db_hlr.c:480) % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 ID: 1 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 delete % Deleted subscriber for IMSI '123456789023000' RESULTS: FAIL: ./test_nodes.vty pass: ./test_subscriber.vty Makefile:700: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 1 make[6]: Leaving directory ' Makefile:691: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory ' Makefile:723: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory ' Makefile:550: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory ' Makefile:402: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory ' Makefile:479: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:770: 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 jenkins at lists.osmocom.org Wed Sep 26 00:18:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 26 Sep 2018 00:18:51 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,lc15,True_#843?= In-Reply-To: <797714857.316.1537910247720.JavaMail.jenkins@jenkins.osmocom.org> References: <797714857.316.1537910247720.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1002492903.320.1537921131081.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Sep 26 00:49:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 26 Sep 2018 00:49:43 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1318?= In-Reply-To: <1543029206.319.1537920282769.JavaMail.jenkins@jenkins.osmocom.org> References: <1543029206.319.1537920282769.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1894922290.321.1537922983834.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 64.89 KB...] 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 gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC rsl.lo CC comp128v23.lo CC gsm48.lo CC gsm_utils.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 gsm0411_utils.lo CC gsm0502.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 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 gsup.lo 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 milenage/aes-encblock.lo CC oap_client.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_interleaving.lo CC gsm0503_parity.lo CC gsm0503_mapping.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_vty.lo CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC common_vty.lo /bin/bash: line 2: 13206 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT common_vty.lo -MD -MP -MF $depbase.Tpo -c -o common_vty.lo common_vty.c Makefile:495: recipe for target 'common_vty.lo' failed make[2]: *** [common_vty.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: 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 Sep 26 07:23:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:23:48 +0000 Subject: Change in osmo-hlr[master]: fix VTY tests to expect well-formed output of logging configuration Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11096 Change subject: fix VTY tests to expect well-formed output of logging configuration ...................................................................... fix VTY tests to expect well-formed output of logging configuration In libosmocore Change-Id Ia75c7067284ea225cffe13ca71bad05a7747ae66 we fixed the generation (saving) of logging configuration to use one level of indent, rather than the previous broken implementation with two levels of indent. This means we have to adjust the VTY test expectations here. Change-Id: I9282a59bbfad4cfc86e86c1212c74cccfe187ff8 --- M tests/test_nodes.vty 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/96/11096/1 diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 95e132d..a9d4ac4 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -108,10 +108,10 @@ ! log stderr ... - logging level main notice - logging level db notice - logging level auc notice - logging level ss info + logging level main notice + logging level db notice + logging level auc notice + logging level ss info ... hlr gsup -- To view, visit https://gerrit.osmocom.org/11096 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: I9282a59bbfad4cfc86e86c1212c74cccfe187ff8 Gerrit-Change-Number: 11096 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 07:25:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:25:33 +0000 Subject: Change in osmo-hlr[master]: fix VTY tests to expect well-formed output of logging configuration In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11096 ) Change subject: fix VTY tests to expect well-formed output of logging configuration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11096 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: I9282a59bbfad4cfc86e86c1212c74cccfe187ff8 Gerrit-Change-Number: 11096 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 07:25: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 Sep 26 07:25:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:25:34 +0000 Subject: Change in osmo-hlr[master]: fix VTY tests to expect well-formed output of logging configuration In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11096 ) Change subject: fix VTY tests to expect well-formed output of logging configuration ...................................................................... fix VTY tests to expect well-formed output of logging configuration In libosmocore Change-Id Ia75c7067284ea225cffe13ca71bad05a7747ae66 we fixed the generation (saving) of logging configuration to use one level of indent, rather than the previous broken implementation with two levels of indent. This means we have to adjust the VTY test expectations here. Change-Id: I9282a59bbfad4cfc86e86c1212c74cccfe187ff8 --- M tests/test_nodes.vty 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 95e132d..a9d4ac4 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -108,10 +108,10 @@ ! log stderr ... - logging level main notice - logging level db notice - logging level auc notice - logging level ss info + logging level main notice + logging level db notice + logging level auc notice + logging level ss info ... hlr gsup -- To view, visit https://gerrit.osmocom.org/11096 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: I9282a59bbfad4cfc86e86c1212c74cccfe187ff8 Gerrit-Change-Number: 11096 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 Wed Sep 26 07:25:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:25:50 +0000 Subject: Change in libosmo-abis[master]: ensure unix socket paths are NUL-terminated for bind/connect In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11045 ) Change subject: ensure unix socket paths are NUL-terminated for bind/connect ...................................................................... ensure unix socket paths are NUL-terminated for bind/connect The unix(7) man page recommends that sun_path is NUL-terminated when struct sockaddr_un is passed to a bind() or connect() call. Non-NUL-terminated paths only need to be dealt with at the receiving end of a UNIX domain socket. Commit b24efa5 erroneously assumed otherwise. Change-Id: I9beecfa500db75cb679b1edcc352c893bf098b13 Fixes: b24efa551dc91e177c5cb8da674e9f8432d52dc9 Related: OS#2673 --- M src/e1_input_vty.c M src/input/unixsocket.c 2 files changed, 15 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 653c573..d81c859 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -101,10 +101,10 @@ 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)) { + /* Don't exceed the maximum unix socket path length, including a NUL byte. See the unix(7) man page.*/ + if (strlen(argv[1]) > sizeof(sun.sun_path) - 1) { vty_out(vty, "%% Socket path length exceeds %zd bytes: '%s'%s", - sizeof(sun.sun_path), argv[1], VTY_NEWLINE); + sizeof(sun.sun_path) - 1, argv[1], VTY_NEWLINE); return CMD_WARNING; } diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c index 00e1f9b..bc4b357 100644 --- a/src/input/unixsocket.c +++ b/src/input/unixsocket.c @@ -229,7 +229,7 @@ static int unixsocket_line_update(struct e1inp_line *line) { struct unixsocket_line *config; - char default_sock_path[sizeof(struct sockaddr_un) + 1]; /* see unix(7) man page */ + struct sockaddr_un un; const char *sock_path; int ret = 0; int i; @@ -252,9 +252,17 @@ /* 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; + ret = snprintf(un.sun_path, sizeof(un.sun_path), "%s%d", + UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); + if (ret == -1) { + LOGP(DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno)); + return -errno; + } else if (ret >= sizeof(un.sun_path)) { + LOGP(DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n", + sizeof(un.sun_path), UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); + return -ENOSPC; + } + sock_path = un.sun_path; } else sock_path = line->sock_path; ret = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, -- To view, visit https://gerrit.osmocom.org/11045 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: I9beecfa500db75cb679b1edcc352c893bf098b13 Gerrit-Change-Number: 11045 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 Wed Sep 26 07:25:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:25:53 +0000 Subject: Change in libosmocore[master]: ensure unix socket paths are NUL-terminated for bind/connect In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11044 ) Change subject: ensure unix socket paths are NUL-terminated for bind/connect ...................................................................... ensure unix socket paths are NUL-terminated for bind/connect The unix(7) man page recommends that sun_path is NUL-terminated when struct sockaddr_un is passed to a bind() or connect() call. Non-NUL-terminated paths only need to be dealt with at the receiving end of a UNIX domain socket. Commit 896ff6d erroneously assumed otherwise. This commit almost reverts 896ff6d: It only leaves the added osmo_strlcpy() overflow check in place. Change-Id: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a Fixes: 896ff6db161465d506bb9bb5bee2cdeef220dd2e Related: OS#2673 --- M src/socket.c 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/socket.c b/src/socket.c index 6f56efb..a85edb7 100644 --- a/src/socket.c +++ b/src/socket.c @@ -605,29 +605,27 @@ 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; - 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)) { + /* When an AF_UNIX socket is bound, sun_path should be NUL-terminated. See unix(7) man page. */ + 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 = socket_path_len; + local.sun_len = strlen(local.sun_path); #endif #if defined(BSD44SOCKETS) || defined(SUN_LEN) namelen = SUN_LEN(&local); #else - namelen = socket_path_len + offsetof(struct sockaddr_un, sun_path); + namelen = strlen(local.sun_path) + + offsetof(struct sockaddr_un, sun_path); #endif sfd = socket(AF_UNIX, type, proto); -- To view, visit https://gerrit.osmocom.org/11044 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: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a Gerrit-Change-Number: 11044 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 Wed Sep 26 07:26:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:26:01 +0000 Subject: Change in osmo-bsc[master]: check for overlong unix socket paths In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11046 ) Change subject: check for overlong unix socket paths ...................................................................... check for overlong unix socket paths In rf_create_socket(), check the result of osmo_strlcpy(). This catches overlong and non-NUL-terminated socket paths. Change-Id: I4b9ff9146068bf7f53d67c577454f32c02361b86 Related: OS#2673 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index f4a21b5..ac87fb9 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -450,8 +450,12 @@ } local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)); unlink(local.sun_path); + if (osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { + LOGP(DLINP, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", + sizeof(local.sun_path), path); + return -1; + } /* we use the same magic that X11 uses in Xtranssock.c for * calculating the proper length of the sockaddr */ -- To view, visit https://gerrit.osmocom.org/11046 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: I4b9ff9146068bf7f53d67c577454f32c02361b86 Gerrit-Change-Number: 11046 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 Wed Sep 26 07:26:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:26:36 +0000 Subject: Change in osmo-pcu[master]: check for overlong unix socket paths In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11048 ) Change subject: check for overlong unix socket paths ...................................................................... check for overlong unix socket paths In pcu_l1if_open(), use osmo_strlcpy() instead of strncpy() and check for overflow. This catches overlong and non-NUL-terminated socket paths. Change-Id: I825190cbb34d052b797e9fb5208884d6f5992839 Related: OS#2673 --- M src/osmobts_sock.cpp 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 477521d..6b49347 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -265,8 +265,11 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; + if (osmo_strlcpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", + sizeof(local.sun_path), bts->pcu_sock_path); + return -ENOSPC; + } /* we use the same magic that X11 uses in Xtranssock.c for * calculating the proper length of the sockaddr */ -- To view, visit https://gerrit.osmocom.org/11048 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: I825190cbb34d052b797e9fb5208884d6f5992839 Gerrit-Change-Number: 11048 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 07:27:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:27:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9674 ) Change subject: bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc ...................................................................... bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc Add f_gen_handover_req() like f_gen_ass_req(), to match AoIP or SCCPlite requirements. For incoming HO, MSC_ConnHdlr needs to know the SCCP addresses to expect the incoming SCCP Connection from MSC to BSC. Add 'handover' section to TestHdlrParams, and pass in the addresses from test_CT via that. In osmo-bsc.cfg, add a remote neighbor config, so that the VTY command 'handover any to arfcn 123 bsic any' can trigger an outgoing inter-BSC HO. Add various BSSMAP handover templates to BSSMAP_Templates.ttcn. Add RR Ho Command template to L3_Templates.ttcn. Move ts_BSSAP_Conn_Req() from msc/BSC_ConnectionHandler.ttcn to library/BSSMAP_Emulation.ttcn, so we can also model an SCCP Connection Request in BSC_Tests.ttcn (this time from MSC to BSC). Add the two new tests to bsc/expected-results.xml. Related: OS#2283 Change-Id: Id22852d4be7f127d827e7a8beeec55db27c07f03 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M bsc/expected-results.xml M bsc/osmo-bsc.cfg M library/BSSMAP_Emulation.ttcn M library/BSSMAP_Templates.ttcn M library/L3_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn 8 files changed, 400 insertions(+), 9 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 9a43ead..4a34310 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -33,6 +33,8 @@ import from RSL_Types all; import from RSL_Emulation all; import from MGCP_Emulation all; +import from MGCP_Templates all; +import from MGCP_Types all; import from Osmocom_CTRL_Functions all; import from Osmocom_CTRL_Types all; @@ -43,12 +45,15 @@ import from MobileL3_CommonIE_Types all; import from MobileL3_Types all; +import from MobileL3_RRM_Types all; import from L3_Templates all; import from GSM_RR_Types all; import from SCCP_Templates all; import from BSSMAP_Templates all; +import from SCCPasp_Types all; + const integer NUM_BTS := 3; const float T3101_MAX := 12.0; @@ -572,6 +577,19 @@ return ass_cmd; } +function f_gen_handover_req() return PDU_BSSAP { + var PDU_BSSAP ho_req; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + ho_req := valueof(ts_BSSMAP_HandoverRequest(omit, tla)); + } else { + var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1)); + ho_req := valueof(ts_BSSMAP_HandoverRequest(cic, omit)); + } + return ho_req; +} + /* generate an assignment complete template for either AoIP or SCCPlite */ function f_gen_exp_compl() return template PDU_BSSAP { var template PDU_BSSAP exp_compl; @@ -2083,6 +2101,10 @@ vc_conn.done; } +/*********************************************************************** + * Handover + ***********************************************************************/ + /* execute a "bts <0-255> trx <0-255> timeslot <0-7> " command on given Dchan */ private function f_vty_ts_action(charstring suffix, integer bts_nr, integer trx_nr, integer ts_nr) runs on test_CT { @@ -2165,6 +2187,158 @@ vc_conn.done; } +private function f_tc_ho_out_of_this_bsc(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + f_sleep(0.5); + /* The MSC negotiates Handover Request and Handover Request Ack with + * the other BSS and comes back with a BSSMAP Handover Command + * containing an RR Handover Command coming from the target BSS... */ + + var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); + log("Remote cell's RR Handover Command passed through as L3 Info: ", rr_ho_cmd); + var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); + log("Remote cell's RR Handover Command passed through as L3 Info, encoded: ", rr_ho_cmd_enc); + BSSAP.send(ts_BSSMAP_HandoverCommand(rr_ho_cmd_enc)); + + /* expect the Handover Command to go out on RR */ + var RSL_Message rsl_ho_cmd + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, ?)) -> value rsl_ho_cmd; + log("RSL Data Req went out to first BTS: ", rsl_ho_cmd); + var RSL_IE_Body rsl_ho_cmd_l3; + if (not f_rsl_find_ie(rsl_ho_cmd, RSL_IE_L3_INFO, rsl_ho_cmd_l3)) { + log("RSL message contains no L3 Info IE, expected RR Handover Command"); + setverdict(fail); + } else { + log("Found L3 Info: ", rsl_ho_cmd_l3); + if (rsl_ho_cmd_l3.l3_info.payload != rr_ho_cmd_enc) { + log("FAIL: the BSC sent out a different L3 Info, not matching the RR Handover Command the other BSS forwarded."); + setverdict(fail); + } else { + log("Success: the BSC sent out the same RR Handover Command the other BSS forwarded."); + setverdict(pass); + } + } + + /* When the other BSS has reported a completed handover, this side is + * torn down. */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_HANDOVER_SUCCESSFUL; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_of_this_bsc() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_of_this_bsc)); + vc_conn.done; +} + +private function f_tc_ho_into_this_bsc(charstring id) runs on MSC_ConnHdlr { + /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the + * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting + * on the lchan even before we get a chance to evaluate the BSSMAP Handover Request ACK. So we + * need to assume that osmo-bsc will activate TS 1 and already set up this lchan's RSL emulation + * before we get started. */ + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. Here comes the new MS on + * the new lchan with a Handover RACH: */ + + /* send handover detect */ + + RSL.send(ts_RSL_HANDO_DET(new_chan_nr)); + + BSSAP.receive(tr_BSSMAP_HandoverDetect); + + /* send handover complete over the new channel */ + + var PDU_ML3_MS_NW l3_tx := valueof(ts_RRM_HandoverComplete('00'O)); + RSL.send(ts_RSL_EST_IND(new_chan_nr, valueof(ts_RslLinkID_DCCH(0)), + enc_PDU_ML3_MS_NW(l3_tx))); + + BSSAP.receive(tr_BSSMAP_HandoverComplete); + setverdict(pass); +} +testcase TC_ho_into_this_bsc() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_into_this_bsc), pars); + vc_conn.done; +} + + /* OS#3041: Open and close N connections in a normal fashion, and expect no * BSSMAP Reset just because of that. */ testcase TC_bssap_rlsd_does_not_cause_bssmap_reset() runs on test_CT { @@ -2648,7 +2822,10 @@ execute( TC_unsol_ho_fail() ); execute( TC_err_82_short_msg() ); execute( TC_err_84_unknown_msg() ); + execute( TC_ho_int() ); + execute( TC_ho_out_of_this_bsc() ); + execute( TC_ho_into_this_bsc() ); execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); execute( TC_bssmap_clear_does_not_cause_bssmap_reset() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 9f67f1b..0b11786 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -411,6 +411,11 @@ BIT4 exp_sts optional } +type record TestHdlrParamsHandover { + SCCP_PAR_Address sccp_addr_msc, + SCCP_PAR_Address sccp_addr_bsc +} + type record TestHdlrParams { OCT1 ra, GsmFrameNumber fn, @@ -420,7 +425,8 @@ BSSMAP_IE_SpeechCodecList ass_codec_list optional, RSL_IE_Body expect_mr_conf_ie optional, /* typically present for AMR codecs */ TestHdlrEncrParams encr optional, - TestHdlrParamsLcls lcls + TestHdlrParamsLcls lcls, + TestHdlrParamsHandover handover optional }; template (value) TestHdlrParams t_def_TestHdlrPars := { @@ -437,7 +443,8 @@ cfg := omit, csc := omit, exp_sts := omit - } + }, + handover := omit } function f_create_chan_and_exp() runs on MSC_ConnHdlr { diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 33bc243..64d0444 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -69,6 +69,8 @@ + + diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index b85c690..724d567 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -88,6 +88,8 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 + # remote-BSS neighbor: + neighbor add lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn index 921ac59..55ce2fb 100644 --- a/library/BSSMAP_Emulation.ttcn +++ b/library/BSSMAP_Emulation.ttcn @@ -102,6 +102,12 @@ dtap := dtap } +template BSSAP_Conn_Req ts_BSSAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, PDU_BSSAP bssap) := { + addr_peer := peer, + addr_own := own, + bssap := bssap +}; + /* port between individual per-connection components and this dispatcher */ type port BSSAP_Conn_PT message { diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 70db2ec..adfcc9e 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -670,6 +670,139 @@ } } +template PDU_BSSAP tr_BSSMAP_HandoverRequired modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverRequired := { + messageType := '11'O + } + } + } +} + +template (value) PDU_BSSAP ts_BSSMAP_HandoverCommand(octetstring layer3info) +modifies ts_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverCommand := { + messageType := '13'O, + layer3Information := { + elementIdentifier := '17'O, + lengthIndicator := 0, + layer3info := layer3info + }, + cellIdentifier := omit, + newBSSToOldBSSInfo := omit, + talkerPriority := omit + } + } + } +} + +template PDU_BSSAP ts_BSSMAP_HandoverRequest( + template BSSMAP_IE_CircuitIdentityCode cic := omit, + template BSSMAP_IE_AoIP_TransportLayerAddress aoip_tla := omit, + template BSSMAP_IE_CellIdentifier cell_id_target := ts_CellID_LAC_CI(1, 0), + template BSSMAP_IE_CellIdentifier cell_id_source := ts_CellID_LAC_CI(1, 1) + ) +modifies ts_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverRequest := { + messageType := '10'O, + channelType := ts_BSSMAP_IE_ChannelType, + encryptionInformation := + ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O), + classmarkInformationType := { + classmarkInformationType1 := { + elementIdentifier := '1D'O, + rf_PowerCapability := '000'B, + a5_1 := '0'B, + esind := '0'B, + revisionLevel := '10'B, + spare1_1 := '0'B + } + }, + cellIdentifierSource := cell_id_source, + priority := omit, + circuitIdentityCode := cic, + downLinkDTX_Flag := omit, + cellIdentifierTarget := cell_id_target, + interferenceBandToBeUsed := omit, + cause := omit, + classmarkInformationType3 := omit, + currentChannelType1 := omit, + speechVersion := omit, + groupCallReference := omit, + talkerFlag := omit, + configurationEvolutionIndication := omit, + chosenEncryptionAlgorithm := omit, + oldToNewBSSInfo := omit, + lSAInformation := omit, + lSAAccessControlSuppression := omit, + serviceHandover := omit, + iMSI_bssmap := omit, + sourceToTargetRNCTransparentInfo := omit, + sourceToTargetRNCTransparentInfoCDMA := omit, + sNAAccessInformation := omit, + talkerPriority := omit, + aoIPTransportLayer := aoip_tla, + codecList := omit, + callIdentifier := omit, + kC128 := omit, + globalCallReference := omit, + lCLS_Configuration := omit, + connectionStatusControl := omit + } + } + } +} + +template PDU_BSSAP tr_BSSMAP_HandoverRequestAcknowledge(template octetstring layer3info) +modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverRequestAck := { + messageType := '12'O, + layer3Information := { + elementIdentifier := '17'O, + lengthIndicator := ?, + layer3info := layer3info + } + } + } + } +} + +template PDU_BSSAP tr_BSSMAP_HandoverDetect +modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverDetect := { + messageType := '1B'O, + talkerPriority := * + } + } + } +} + +template PDU_BSSAP tr_BSSMAP_HandoverComplete +modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverComplete := { + messageType := '14'O, + rR_Cause := *, + talkerPriority := *, + speechCodec := *, + codecList := *, + chosenEncryptionAlgorithm := *, + chosenChannel := *, + lCLS_BSS_Status := * + } + } + } +} template BSSMAP_IE_IMSI ts_BSSMAP_Imsi(hexstring imsi_digits) := { elementIdentifier := '08'O, diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 1ce84cf..a05aba2 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -496,6 +496,76 @@ } } +template (value) PDU_ML3_NW_MS ts_RR_HandoverCommand := { + discriminator := '0110'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + handoverCommand := { + messageType := '00101011'B, + cellDescription := { + bcc := '001'B, + ncc := '010'B, + BCCHArfcn_HighPart := '11'B, + BCCHArfcn_LowPart := '04'O + }, + channelDescription2 := { + timeslotNumber := '110'B, + channelTypeandTDMAOffset := '00001'B, + octet3 := '00'O, + octet4 := '09'O + }, + handoverReference := { + handoverReferenceValue := '00'O + }, + powerCommandAndAccesstype := { + powerlevel := '00000'B, + fPC_EP := '0'B, + ePC_Mode := '0'B, + aTC := '0'B + }, + synchronizationIndication := omit, + frequencyShortListAfterTime := omit, + frequencyListAfterTime := omit, + cellChannelDescription := omit, + multislotAllocation := omit, + modeOfChannelSet1 := omit, + modeOfChannelSet2 := omit, + modeOfChannelSet3 := omit, + modeOfChannelSet4 := omit, + modeOfChannelSet5 := omit, + modeOfChannelSet6 := omit, + modeOfChannelSet7 := omit, + modeOfChannelSet8 := omit, + descrOf2ndCh_at := omit, + modeOf2ndChannel := omit, + frequencyChannelSequence_at := omit, + mobileAllocation_at := omit, + startingTime := omit, + timeDifference := omit, + timingAdvance := omit, + frequencyShortListBeforeTime := omit, + frequencyListBeforeTime := omit, + descrOf1stCh_bt := omit, + descrOf2ndCh_bt := omit, + frequencyChannelSequence_bt := omit, + mobileAllocation_bt := omit, + cipherModeSetting := omit, + vGCS_TargetModeIndication := omit, + multiRateConfiguration := omit, + dynamicARFCN_Mapping := omit, + vGCS_Ciphering_Parameters := omit, + dedicatedServiceInformation := omit, + pLMNIndex := omit, + extendedTSCSet_afterTime := omit, + extendedTSCSet_beforeTime := omit + } + } + } +} + function ts_CM3_TLV(template (omit) OCTN cm3) return template MobileStationClassmark3_TLV { if (not isvalue(cm3)) { return omit; diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 4e02d6c..bf7a6d2 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -166,12 +166,6 @@ -template BSSAP_Conn_Req ts_BSSAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, PDU_BSSAP bssap) := { - addr_peer := peer, - addr_own := own, - bssap := bssap -}; - /* Encode 'l3' and ask BSSMAP_Emulation to create new connection with COMPL L3 INFO */ function f_bssap_compl_l3(PDU_ML3_MS_NW l3) runs on BSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/9674 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: Id22852d4be7f127d827e7a8beeec55db27c07f03 Gerrit-Change-Number: 9674 Gerrit-PatchSet: 8 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 Sep 26 07:27:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:27:39 +0000 Subject: Change in osmo-gsm-tester[master]: Optimize and re-use an existing repository In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11063 ) Change subject: Optimize and re-use an existing repository ...................................................................... Optimize and re-use an existing repository Instead of cloning osmocom-bb three times this will allow us to re-use the repository. Simply change the directory, set the new origin and fetch. Change-Id: I63f103b2f70559e969e8c66477ab9ee7f2886832 --- M contrib/jenkins-build-common.sh 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index bfe8d73..ceee5c0 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -75,10 +75,14 @@ fi cd "$base" - rm -rf "$repo" - git clone "$git_url/$repo" "$repo" + if [ -d "$repo" ]; then + cd "$repo" + git fetch + else + git clone "$git_url/$repo" "$repo" + cd "$repo" + fi - cd "$repo" # Figure out whether we need to prepend origin/ to find branches in upstream. # Doing this allows using git hashes instead of a branch name. @@ -86,7 +90,7 @@ branch="origin/$branch" fi - git checkout -b build_branch "$branch" + git checkout -B build_branch "$branch" rm -rf * git reset --hard "$branch" -- To view, visit https://gerrit.osmocom.org/11063 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: I63f103b2f70559e969e8c66477ab9ee7f2886832 Gerrit-Change-Number: 11063 Gerrit-PatchSet: 2 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 gerrit-no-reply at lists.osmocom.org Wed Sep 26 07:27:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:27:39 +0000 Subject: Change in osmo-gsm-tester[master]: Package mobile and virtphy as part of osmocom-bb as well In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11064 ) Change subject: Package mobile and virtphy as part of osmocom-bb as well ...................................................................... Package mobile and virtphy as part of osmocom-bb as well Change-Id: Ie44dca72327e928073b00cde434d1cf2de574d9c --- M contrib/jenkins-build-osmocom-bb.sh 1 file changed, 4 insertions(+), 14 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh index d5eec1e..e968a1a 100755 --- a/contrib/jenkins-build-osmocom-bb.sh +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -8,19 +8,9 @@ FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/" build_repo libosmocore --disable-doxygen - -have_repo osmocom-bb -cd osmocom-bb/ - -cd src/host/osmocon/ -set +x; echo; echo; set -x -autoreconf -fi -set +x; echo; echo; set -x -./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts -set +x; echo; echo; set -x -make -j4 -set +x; echo; echo; set -x -make install +build_repo_dir osmocom-bb src/host/virt_phy --enable-sanitize +build_repo_dir osmocom-bb src/host/osmocon --enable-sanitize +build_repo_dir osmocom-bb src/host/layer23 --enable-sanitize mkdir -p "$prefix" cd "$prefix" @@ -30,4 +20,4 @@ rpm2cpio osmocom-bb-firmware.rpm | cpio -idmv rm osmocom-bb-firmware.rpm -create_bin_tgz "" "osmocon" +create_bin_tgz "virtphy mobile" "osmocon" -- To view, visit https://gerrit.osmocom.org/11064 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: Ie44dca72327e928073b00cde434d1cf2de574d9c Gerrit-Change-Number: 11064 Gerrit-PatchSet: 2 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 gerrit-no-reply at lists.osmocom.org Wed Sep 26 07:27:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:27:39 +0000 Subject: Change in osmo-gsm-tester[master]: Be able to switch-off ASAN builds of our binaries. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11065 ) Change subject: Be able to switch-off ASAN builds of our binaries. ...................................................................... Be able to switch-off ASAN builds of our binaries. Inroduce a way to not take a 2x performance hit when testing. It is of importance if we run with hundreds of BTSes and 10k+ subscribers. In the absence of using getops or shflags use an environment for it. Change-Id: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-ggsn.sh M contrib/jenkins-build-osmo-hlr.sh M contrib/jenkins-build-osmo-iuh.sh M contrib/jenkins-build-osmo-mgw.sh M contrib/jenkins-build-osmo-msc.sh M contrib/jenkins-build-osmo-pcu.sh M contrib/jenkins-build-osmo-sgsn.sh M contrib/jenkins-build-osmo-stp.sh M contrib/jenkins-build-osmocom-bb.sh 12 files changed, 55 insertions(+), 51 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index ceee5c0..17ab7df 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -49,6 +49,10 @@ # osmo-bts within the sysmoBTS SDK prefix_real="${prefix_real-"$prefix"}" +# Flag to be used to enable ASAN in builds. Defaults to enable ASAN builds and +# it can be disabled by passing SANITIZE_FLAGS="" to the build. +SANITIZE_FLAGS="${SANITIZE_FLAGS---enable-sanitize}" + export PKG_CONFIG_PATH="$prefix_real/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$prefix_real/lib:$LD_LIBRARY_PATH" diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh index 4081a00..5d4d333 100755 --- a/contrib/jenkins-build-osmo-bsc.sh +++ b/contrib/jenkins-build-osmo-bsc.sh @@ -4,11 +4,11 @@ name="osmo-bsc" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize -build_repo osmo-mgw --enable-sanitize -build_repo osmo-bsc --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo osmo-mgw ${SANITIZE_FLAGS} +build_repo osmo-bsc ${SANITIZE_FLAGS} create_bin_tgz "osmo-bsc abisip-find ipaccess-config" diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index e5fab5d..46a1c11 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -6,8 +6,8 @@ have_repo octphy-2g-headers -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo osmo-bts --enable-sanitize --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers create_bin_tgz "osmo-bts-trx osmo-bts-octphy" diff --git a/contrib/jenkins-build-osmo-ggsn.sh b/contrib/jenkins-build-osmo-ggsn.sh index a2cf952..fec2633 100755 --- a/contrib/jenkins-build-osmo-ggsn.sh +++ b/contrib/jenkins-build-osmo-ggsn.sh @@ -4,7 +4,7 @@ name="osmo-ggsn" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo osmo-ggsn --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo osmo-ggsn ${SANITIZE_FLAGS} create_bin_tgz osmo-ggsn diff --git a/contrib/jenkins-build-osmo-hlr.sh b/contrib/jenkins-build-osmo-hlr.sh index 3229e52..0b60955 100755 --- a/contrib/jenkins-build-osmo-hlr.sh +++ b/contrib/jenkins-build-osmo-hlr.sh @@ -4,8 +4,8 @@ name="osmo-hlr" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo osmo-hlr --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo osmo-hlr ${SANITIZE_FLAGS} create_bin_tgz osmo-hlr diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-iuh.sh index 03295f9..e8e7fa8 100755 --- a/contrib/jenkins-build-osmo-iuh.sh +++ b/contrib/jenkins-build-osmo-iuh.sh @@ -4,12 +4,12 @@ name="osmo-iuh" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize -build_repo libasn1c --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo libasn1c ${SANITIZE_FLAGS} -build_repo osmo-iuh --enable-sanitize +build_repo osmo-iuh ${SANITIZE_FLAGS} create_bin_tgz "osmo-hnbgw" diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index 5c1ce74..a04e0ca 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -4,9 +4,9 @@ name="osmo-mgw" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo osmo-mgw --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo osmo-mgw ${SANITIZE_FLAGS} create_bin_tgz "osmo-mgw" diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index b614052..c64f94d 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -4,15 +4,15 @@ name="osmo-msc" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -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 libasn1c --enable-sanitize -build_repo osmo-iuh --enable-sanitize -build_repo osmo-msc --enable-sanitize --enable-smpp --enable-iu +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libsmpp34 ${SANITIZE_FLAGS} +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo osmo-mgw ${SANITIZE_FLAGS} +build_repo osmo-hlr ${SANITIZE_FLAGS} +build_repo libasn1c ${SANITIZE_FLAGS} +build_repo osmo-iuh ${SANITIZE_FLAGS} +build_repo osmo-msc ${SANITIZE_FLAGS} --enable-smpp --enable-iu create_bin_tgz osmo-msc diff --git a/contrib/jenkins-build-osmo-pcu.sh b/contrib/jenkins-build-osmo-pcu.sh index 3d3fdd0..1877f9c 100755 --- a/contrib/jenkins-build-osmo-pcu.sh +++ b/contrib/jenkins-build-osmo-pcu.sh @@ -4,7 +4,7 @@ name="osmo-pcu" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-pcsc --disable-doxygen -build_repo osmo-pcu --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-pcsc --disable-doxygen +build_repo osmo-pcu ${SANITIZE_FLAGS} create_bin_tgz osmo-pcu diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index 87aed76..ffa787c 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -4,13 +4,13 @@ name="osmo-sgsn" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize -build_repo osmo-ggsn --enable-sanitize -build_repo libasn1c --enable-sanitize -build_repo osmo-iuh --enable-sanitize -build_repo osmo-sgsn --enable-sanitize --enable-iu +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} +build_repo osmo-ggsn ${SANITIZE_FLAGS} +build_repo libasn1c ${SANITIZE_FLAGS} +build_repo osmo-iuh ${SANITIZE_FLAGS} +build_repo osmo-sgsn ${SANITIZE_FLAGS} --enable-iu create_bin_tgz osmo-sgsn diff --git a/contrib/jenkins-build-osmo-stp.sh b/contrib/jenkins-build-osmo-stp.sh index 985b090..5f9c421 100755 --- a/contrib/jenkins-build-osmo-stp.sh +++ b/contrib/jenkins-build-osmo-stp.sh @@ -4,9 +4,9 @@ name="osmo-stp" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --enable-sanitize --disable-doxygen -build_repo libosmo-abis --enable-sanitize -build_repo libosmo-netif --enable-sanitize --disable-doxygen -build_repo libosmo-sccp --enable-sanitize +build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen +build_repo libosmo-sccp ${SANITIZE_FLAGS} create_bin_tgz osmo-stp diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh index e968a1a..827fc94 100755 --- a/contrib/jenkins-build-osmocom-bb.sh +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -8,9 +8,9 @@ FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/" build_repo libosmocore --disable-doxygen -build_repo_dir osmocom-bb src/host/virt_phy --enable-sanitize -build_repo_dir osmocom-bb src/host/osmocon --enable-sanitize -build_repo_dir osmocom-bb src/host/layer23 --enable-sanitize +build_repo_dir osmocom-bb src/host/virt_phy ${SANITIZE_FLAGS} +build_repo_dir osmocom-bb src/host/osmocon ${SANITIZE_FLAGS} +build_repo_dir osmocom-bb src/host/layer23 ${SANITIZE_FLAGS} mkdir -p "$prefix" cd "$prefix" -- To view, visit https://gerrit.osmocom.org/11065 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: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c Gerrit-Change-Number: 11065 Gerrit-PatchSet: 2 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 gerrit-no-reply at lists.osmocom.org Wed Sep 26 07:28:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:28:05 +0000 Subject: Change in python/osmo-python-tests[master]: osmo-ctrl2cgi.service: Fix exec path not absolute In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11077 ) Change subject: osmo-ctrl2cgi.service: Fix exec path not absolute ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11077 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: I8e3d695951fb36d53c112b6dce10a275b757ca5a Gerrit-Change-Number: 11077 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 07:28: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 Sep 26 07:28:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:28:08 +0000 Subject: Change in python/osmo-python-tests[master]: osmo-ctrl2cgi.service: Fix exec path not absolute In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11077 ) Change subject: osmo-ctrl2cgi.service: Fix exec path not absolute ...................................................................... osmo-ctrl2cgi.service: Fix exec path not absolute systemd errors due to executabl path not being absolute: systemd[1]: [/lib/systemd/system/osmo-ctrl2cgi.service:7] Executable path is not absolute, ignoring: python3 /usr/bin/ctrl2cgi.py systemd[1]: osmo-ctrl2cgi.service: Service lacks both ExecStart= and ExecStop= setting. Refusing. Change-Id: I8e3d695951fb36d53c112b6dce10a275b757ca5a --- M contrib/systemd/osmo-ctrl2cgi.service 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 36ff78b..8563c66 100644 --- a/contrib/systemd/osmo-ctrl2cgi.service +++ b/contrib/systemd/osmo-ctrl2cgi.service @@ -4,7 +4,7 @@ [Service] Type=simple Restart=always -ExecStart=python3 /usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini +ExecStart=/usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini RestartSec=2 [Install] -- To view, visit https://gerrit.osmocom.org/11077 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: I8e3d695951fb36d53c112b6dce10a275b757ca5a Gerrit-Change-Number: 11077 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 Sep 26 07:28:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 07:28:20 +0000 Subject: Change in osmo-bts[master]: vty: mark 'rtp bind-ip' deprecated, not hidden In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11074 ) Change subject: vty: mark 'rtp bind-ip' deprecated, not hidden ...................................................................... vty: mark 'rtp bind-ip' deprecated, not hidden The command implementation says "deprecated", so then the vty command attribute should also be DEPRECATED. It will be hidden from online docs and vty reference. Change-Id: I23e620f1b947e129989fe69c6380c91b9abf7021 --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/vty.c b/src/common/vty.c index 6061335..f918f57 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -464,7 +464,7 @@ #define RTP_STR "RTP parameters\n" -DEFUN_HIDDEN(cfg_bts_rtp_bind_ip, +DEFUN_DEPRECATED(cfg_bts_rtp_bind_ip, cfg_bts_rtp_bind_ip_cmd, "rtp bind-ip A.B.C.D", RTP_STR "RTP local bind IP Address\n" "RTP local bind IP Address\n") -- To view, visit https://gerrit.osmocom.org/11074 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: I23e620f1b947e129989fe69c6380c91b9abf7021 Gerrit-Change-Number: 11074 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 jenkins at lists.osmocom.org Wed Sep 26 07:30:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 26 Sep 2018 07:30:17 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-hlr_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1319?= In-Reply-To: <1894922290.321.1537922983834.JavaMail.jenkins@jenkins.osmocom.org> References: <1894922290.321.1537922983834.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <825064132.329.1537947017547.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Sep 26 08:18:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 26 Sep 2018 08:18:48 +0000 Subject: Change in osmo-bsc[master]: lcls: log channel type and lchan names on LCLS codec mismatch Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11097 Change subject: lcls: log channel type and lchan names on LCLS codec mismatch ...................................................................... lcls: log channel type and lchan names on LCLS codec mismatch When a codec mismatch (lchan type or tch_mode does not match) occurs, we do not know which of the two lchan had which type or tch_mode. Lets print that information as well to make debugging easier. Change-Id: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/11097/1 diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 00c3296..f2958e9 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -273,16 +273,27 @@ LOGPFSM(conn->lcls.fi, "Not enabling LS due to insufficient other control\n"); return false; } - + if (conn->lchan->type != conn->lcls.other->lchan->type && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (channel type)\n"); + LOGPFSM(conn->lcls.fi, + "Not enabling LS due to channel type mismatch: %s:%s != %s:%s\n", + gsm_lchan_name(conn->lchan), + gsm_chan_t_name(conn->lchan->type), + gsm_lchan_name(conn->lcls.other->lchan), + gsm_chan_t_name(conn->lcls.other->lchan->type)); return false; } if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (TCH-Mode)\n"); + LOGPFSM(conn->lcls.fi, + "Not enabling LS due to TCH-mode mismatch: %s:%s != %s:%s\n", + gsm_lchan_name(conn->lchan), + gsm48_chan_mode_name(conn->lchan->tch_mode), + gsm_lchan_name(conn->lcls.other->lchan), + gsm48_chan_mode_name(conn->lcls.other->lchan-> + tch_mode)); return false; } -- To view, visit https://gerrit.osmocom.org/11097 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: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Gerrit-Change-Number: 11097 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 08:18:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 26 Sep 2018 08:18:48 +0000 Subject: Change in osmo-bsc[master]: fix LCLS during Assignment: actually use new TCH lchan Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11098 Change subject: fix LCLS during Assignment: actually use new TCH lchan ...................................................................... fix LCLS during Assignment: actually use new TCH lchan In assignment_success(), don't trigger lcls_apply_config() before the conn->lchan points at the actual new voice lchan. The entire LCLS code relies on conn->lchan. The assignment FSM wants to point conn->lchan to the new lchan only after it is sure that sending the Assignment Complete to the MSC was successful. However, a failure is a) very unlikely and b) if sending to the MSC fails we might as well tear the whole conn down anyway. Now, if sending to the MSC fails, release the lchan and the conn should clean itself up. Related: OS#1602 Change-Id: I8dd561d744d8081b5ac5ffa7635f17ac19bcda45 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/11098/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 5304d6c..a7564e0 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -200,19 +200,23 @@ static void assignment_success(struct gsm_subscriber_connection *conn) { - /* apply LCLS configuration (if any) */ - lcls_apply_config(conn); - - send_assignment_complete(conn, conn->assignment.new_lchan); - /* If something went wrong during send_assignment_complete(), the fi will be gone from - * error handling in there. Almost a success, but then again the whole thing failed. */ - if (!conn->assignment.fi) - return; - /* Take on the new lchan */ gscon_change_primary_lchan(conn, conn->assignment.new_lchan); conn->assignment.new_lchan = NULL; + /* apply LCLS configuration (if any) */ + lcls_apply_config(conn); + + send_assignment_complete(conn, conn->lchan); + /* If something went wrong during send_assignment_complete(), the fi will be gone from + * error handling in there. Almost a success, but then again the whole thing failed. */ + if (!conn->assignment.fi) { + /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, + * the conn will notice that its primary lchan is gone and should clean itself up. */ + lchan_release(conn->lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + return; + } + /* Rembered this only for error handling: should assignment fail, assignment_reset() will release * the MGW endpoint right away. If successful, the conn continues to use the endpoint. */ conn->assignment.created_ci_for_msc = NULL; -- To view, visit https://gerrit.osmocom.org/11098 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: I8dd561d744d8081b5ac5ffa7635f17ac19bcda45 Gerrit-Change-Number: 11098 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 08:18:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 26 Sep 2018 08:18:48 +0000 Subject: Change in osmo-bsc[master]: cosmetic: drop param from send_assignment_complete() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11099 Change subject: cosmetic: drop param from send_assignment_complete() ...................................................................... cosmetic: drop param from send_assignment_complete() After previous patch I8dd561d744d8081b5ac5ffa7635f17ac19bcda45, all callers pass conn->lchan to send_assignment_complete(), so there is no need to pass it separately from conn. Change-Id: I3c038d91a53c81d9fcf4ec62f853b59bb1ecd244 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/11099/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a7564e0..2410adb 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -129,7 +129,7 @@ } } -static void send_assignment_complete(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan) +static void send_assignment_complete(struct gsm_subscriber_connection *conn) { int rc; struct gsm0808_speech_codec sc; @@ -139,7 +139,7 @@ int perm_spch = 0; uint8_t chosen_channel; struct msgb *resp; - struct gsm_lchan *lchan = new_lchan; + struct gsm_lchan *lchan = conn->lchan; struct osmo_fsm_inst *fi = conn->fi; chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->tch_mode); @@ -207,7 +207,7 @@ /* apply LCLS configuration (if any) */ lcls_apply_config(conn); - send_assignment_complete(conn, conn->lchan); + send_assignment_complete(conn); /* If something went wrong during send_assignment_complete(), the fi will be gone from * error handling in there. Almost a success, but then again the whole thing failed. */ if (!conn->assignment.fi) { @@ -348,7 +348,7 @@ " requested chan_mode=%s; current lchan is %s\n", gsm48_chan_mode_name(req->chan_mode), gsm_lchan_name(conn->lchan)); - send_assignment_complete(conn, conn->lchan); + send_assignment_complete(conn); return; } -- To view, visit https://gerrit.osmocom.org/11099 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: I3c038d91a53c81d9fcf4ec62f853b59bb1ecd244 Gerrit-Change-Number: 11099 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 08:25:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 08:25:51 +0000 Subject: Change in docker-playground[master]: debian-*-build: Ensure rebuild on changes in upstream Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11100 Change subject: debian-*-build: Ensure rebuild on changes in upstream ...................................................................... debian-*-build: Ensure rebuild on changes in upstream Let's use the well-known hack of adding the "Release" file of the respective debian distribution/version to ensure docker will invalidate the cache if the repository has changed since the last build. Change-Id: If6f75db11ef424e46c4915b761f9eca69258a9c5 --- M debian-jessie-build/Dockerfile M debian-stretch-build/Dockerfile 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/00/11100/1 diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index 6fe1efa..39653d2 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -2,6 +2,7 @@ MAINTAINER Harald Welte +ADD http://ftp.de.debian.org/debian/dists/jessie/Release /tmp/Release RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index a4526f7..d4dcc39 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -2,6 +2,7 @@ MAINTAINER Harald Welte +ADD http://ftp.de.debian.org/debian/dists/stretch/Release /tmp/Release RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ -- To view, visit https://gerrit.osmocom.org/11100 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: If6f75db11ef424e46c4915b761f9eca69258a9c5 Gerrit-Change-Number: 11100 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 08:25:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 08:25:51 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: Ensure rebuild on changes in repostory Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11101 Change subject: debian-stretch-titan: Ensure rebuild on changes in repostory ...................................................................... debian-stretch-titan: Ensure rebuild on changes in repostory Let's use the well-known hack of adding the "Release" file of the repository to ensure docker will invalidate the cache if the repository has changed since the last build. Change-Id: I54565a4d52221be7e6ded5a339bbf005b58f5998 --- M debian-stretch-titan/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/11101/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 8bf6721..a308c2a 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -13,6 +13,7 @@ rm /tmp/Release.key && \ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && apt-get install -y \ eclipse-titan -- To view, visit https://gerrit.osmocom.org/11101 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: I54565a4d52221be7e6ded5a339bbf005b58f5998 Gerrit-Change-Number: 11101 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 09:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:26:43 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: Ensure rebuild on changes in repostory In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11101 ) Change subject: debian-stretch-titan: Ensure rebuild on changes in repostory ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11101 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: I54565a4d52221be7e6ded5a339bbf005b58f5998 Gerrit-Change-Number: 11101 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 26 Sep 2018 09:26: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 Sep 26 09:26:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:26:50 +0000 Subject: Change in docker-playground[master]: debian-*-build: Ensure rebuild on changes in upstream In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11100 ) Change subject: debian-*-build: Ensure rebuild on changes in upstream ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11100 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: If6f75db11ef424e46c4915b761f9eca69258a9c5 Gerrit-Change-Number: 11100 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 26 Sep 2018 09:26: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 Sep 26 09:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:26:59 +0000 Subject: Change in docker-playground[master]: debian-*-build: Ensure rebuild on changes in upstream In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11100 ) Change subject: debian-*-build: Ensure rebuild on changes in upstream ...................................................................... debian-*-build: Ensure rebuild on changes in upstream Let's use the well-known hack of adding the "Release" file of the respective debian distribution/version to ensure docker will invalidate the cache if the repository has changed since the last build. Change-Id: If6f75db11ef424e46c4915b761f9eca69258a9c5 --- M debian-jessie-build/Dockerfile M debian-stretch-build/Dockerfile 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index 6fe1efa..39653d2 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -2,6 +2,7 @@ MAINTAINER Harald Welte +ADD http://ftp.de.debian.org/debian/dists/jessie/Release /tmp/Release RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index a4526f7..d4dcc39 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -2,6 +2,7 @@ MAINTAINER Harald Welte +ADD http://ftp.de.debian.org/debian/dists/stretch/Release /tmp/Release RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ -- To view, visit https://gerrit.osmocom.org/11100 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: If6f75db11ef424e46c4915b761f9eca69258a9c5 Gerrit-Change-Number: 11100 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 Sep 26 09:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:26:59 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: Ensure rebuild on changes in repostory In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11101 ) Change subject: debian-stretch-titan: Ensure rebuild on changes in repostory ...................................................................... debian-stretch-titan: Ensure rebuild on changes in repostory Let's use the well-known hack of adding the "Release" file of the repository to ensure docker will invalidate the cache if the repository has changed since the last build. Change-Id: I54565a4d52221be7e6ded5a339bbf005b58f5998 --- M debian-stretch-titan/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 8bf6721..a308c2a 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -13,6 +13,7 @@ rm /tmp/Release.key && \ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && apt-get install -y \ eclipse-titan -- To view, visit https://gerrit.osmocom.org/11101 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: I54565a4d52221be7e6ded5a339bbf005b58f5998 Gerrit-Change-Number: 11101 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 Sep 26 09:27:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:27:10 +0000 Subject: Change in docker-playground[master]: ensure well-formed config files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11093 ) Change subject: ensure well-formed config files ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11093 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: Id687e63c418e2e955ccbb92f2420a80fc0704ea4 Gerrit-Change-Number: 11093 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 26 Sep 2018 09:27: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 Sep 26 09:27:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:27:38 +0000 Subject: Change in docker-playground[master]: ensure well-formed config files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11093 ) Change subject: ensure well-formed config files ...................................................................... ensure well-formed config files Change-Id: Id687e63c418e2e955ccbb92f2420a80fc0704ea4 --- M m3ua-test/osmo-stp.cfg M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg M osmo-bts-latest/osmo-bts.cfg M osmo-bts-master/osmo-bts.cfg M osmo-ggsn-latest/osmo-ggsn.cfg M osmo-ggsn-master/osmo-ggsn.cfg M osmo-hlr-latest/osmo-hlr.cfg M osmo-hlr-master/osmo-hlr.cfg M osmo-mgw-latest/osmo-mgw.cfg M osmo-mgw-master/osmo-mgw.cfg M osmo-nitb-master/openbsc.cfg M osmo-stp-latest/osmo-stp.cfg M osmo-stp-master/osmo-stp.cfg M sua-test/osmo-stp.cfg M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/osmo-stp.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg M ttcn3-bts-test/osmo-bsc.cfg M ttcn3-bts-test/osmo-bts.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg M ttcn3-hlr-test/osmo-hlr.cfg M ttcn3-mgw-test/osmo-mgw.cfg M ttcn3-msc-test/osmo-msc.cfg M ttcn3-msc-test/osmo-stp.cfg M ttcn3-sgsn-test/osmo-sgsn.cfg M ttcn3-sip-test/osmo-sip-connector.cfg 27 files changed, 908 insertions(+), 908 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/m3ua-test/osmo-stp.cfg b/m3ua-test/osmo-stp.cfg index db16ad3..23d94e0 100644 --- a/m3ua-test/osmo-stp.cfg +++ b/m3ua-test/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 6b79592..4a69b3a 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -4,43 +4,43 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 5b8093c..f381ace 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -4,43 +4,43 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-bts-latest/osmo-bts.cfg b/osmo-bts-latest/osmo-bts.cfg index e8feff5..446a1b7 100644 --- a/osmo-bts-latest/osmo-bts.cfg +++ b/osmo-bts-latest/osmo-bts.cfg @@ -3,43 +3,43 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level all everything - logging level rsl info - logging level oml debug - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp debug - logging level pcu debug - logging level ho notice - logging level trx notice - logging level loop notice - logging level abis debug - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rsl info + logging level oml debug + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level pcu debug + logging level ho notice + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! line vty no login diff --git a/osmo-bts-master/osmo-bts.cfg b/osmo-bts-master/osmo-bts.cfg index e8feff5..446a1b7 100644 --- a/osmo-bts-master/osmo-bts.cfg +++ b/osmo-bts-master/osmo-bts.cfg @@ -3,43 +3,43 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level all everything - logging level rsl info - logging level oml debug - logging level rll notice - logging level rr notice - logging level meas notice - logging level pag info - logging level l1c info - logging level l1p info - logging level dsp debug - logging level pcu debug - logging level ho notice - logging level trx notice - logging level loop notice - logging level abis debug - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rsl info + logging level oml debug + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level pcu debug + logging level ho notice + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! line vty no login diff --git a/osmo-ggsn-latest/osmo-ggsn.cfg b/osmo-ggsn-latest/osmo-ggsn.cfg index b828789..5337ac8 100644 --- a/osmo-ggsn-latest/osmo-ggsn.cfg +++ b/osmo-ggsn-latest/osmo-ggsn.cfg @@ -3,59 +3,59 @@ !! ! log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-ggsn-master/osmo-ggsn.cfg b/osmo-ggsn-master/osmo-ggsn.cfg index b828789..5337ac8 100644 --- a/osmo-ggsn-master/osmo-ggsn.cfg +++ b/osmo-ggsn-master/osmo-ggsn.cfg @@ -3,59 +3,59 @@ !! ! log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/osmo-hlr-latest/osmo-hlr.cfg b/osmo-hlr-latest/osmo-hlr.cfg index 71a76c8..f3be518 100644 --- a/osmo-hlr-latest/osmo-hlr.cfg +++ b/osmo-hlr-latest/osmo-hlr.cfg @@ -2,13 +2,13 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level all debug - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error ! line vty bind 0.0.0.0 diff --git a/osmo-hlr-master/osmo-hlr.cfg b/osmo-hlr-master/osmo-hlr.cfg index 71a76c8..f3be518 100644 --- a/osmo-hlr-master/osmo-hlr.cfg +++ b/osmo-hlr-master/osmo-hlr.cfg @@ -2,13 +2,13 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level all debug - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error ! line vty bind 0.0.0.0 diff --git a/osmo-mgw-latest/osmo-mgw.cfg b/osmo-mgw-latest/osmo-mgw.cfg index 4bdde6b..44653e3 100644 --- a/osmo-mgw-latest/osmo-mgw.cfg +++ b/osmo-mgw-latest/osmo-mgw.cfg @@ -3,29 +3,29 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/osmo-mgw-master/osmo-mgw.cfg b/osmo-mgw-master/osmo-mgw.cfg index 4bdde6b..44653e3 100644 --- a/osmo-mgw-master/osmo-mgw.cfg +++ b/osmo-mgw-master/osmo-mgw.cfg @@ -3,29 +3,29 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/osmo-nitb-master/openbsc.cfg b/osmo-nitb-master/openbsc.cfg index 8df89f1..31c9a0c 100644 --- a/osmo-nitb-master/openbsc.cfg +++ b/osmo-nitb-master/openbsc.cfg @@ -4,54 +4,54 @@ password foo ! log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level all everything - logging level rll notice - logging level cc notice - logging level mm debug - logging level rr notice - logging level rsl notice - logging level nm info - logging level mncc notice - logging level pag notice - logging level meas notice - logging level sccp notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level db notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level llc debug - logging level sndcp debug - logging level nat notice - logging level ctrl notice - logging level smpp debug - logging level filter debug - logging level ranap debug - logging level sua debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm debug + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level filter debug + logging level ranap debug + logging level sua debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! stats interval 5 ! diff --git a/osmo-stp-latest/osmo-stp.cfg b/osmo-stp-latest/osmo-stp.cfg index aab7f32..ada8378 100644 --- a/osmo-stp-latest/osmo-stp.cfg +++ b/osmo-stp-latest/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/osmo-stp-master/osmo-stp.cfg b/osmo-stp-master/osmo-stp.cfg index aab7f32..ada8378 100644 --- a/osmo-stp-master/osmo-stp.cfg +++ b/osmo-stp-master/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/sua-test/osmo-stp.cfg b/sua-test/osmo-stp.cfg index 23a3eb1..a0043df 100644 --- a/sua-test/osmo-stp.cfg +++ b/sua-test/osmo-stp.cfg @@ -3,49 +3,49 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug ! line vty no login diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 5255127..4249818 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -4,44 +4,44 @@ password foo ! log file /data/osmo-bsc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-bsc-test/osmo-stp.cfg b/ttcn3-bsc-test/osmo-stp.cfg index 09c8a43..0f25f0f 100644 --- a/ttcn3-bsc-test/osmo-stp.cfg +++ b/ttcn3-bsc-test/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 858aa50..4914607 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -4,44 +4,44 @@ password foo ! log file /data/osmo-bsc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 12ee409..13ecd40 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -4,46 +4,46 @@ password foo ! log file /data/osmo-bsc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging print file 1 - logging level all everything - logging level rll info - logging level cc notice - logging level mm notice - logging level rr notice - logging level rsl debug - logging level nm notice - logging level pag notice - logging level meas notice - logging level msc debug - logging level mgcp notice - logging level ho notice - logging level hodec notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level rll info + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl debug + logging level nm notice + logging level pag notice + logging level meas notice + logging level msc debug + logging level mgcp notice + logging level ho notice + logging level hodec notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index ae809fd..04a9d17 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -3,42 +3,42 @@ !! ! log file /data/osmo-bts.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level rsl info - logging level oml info - logging level rll notice - logging level rr notice - logging level meas info - logging level pag info - logging level l1c info - logging level l1p notice - logging level dsp info - logging level pcu debug - logging level ho notice - logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas info + logging level pag info + logging level l1c info + logging level l1p notice + logging level dsp info + logging level pcu debug + logging level ho notice + logging level trx info + logging level loop notice + logging level abis notice + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib debug + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice ! line vty no login diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 7fe5cbc..696c3f7 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -3,59 +3,59 @@ !! ! log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-hlr-test/osmo-hlr.cfg b/ttcn3-hlr-test/osmo-hlr.cfg index 9192b58..8ed77d4 100644 --- a/ttcn3-hlr-test/osmo-hlr.cfg +++ b/ttcn3-hlr-test/osmo-hlr.cfg @@ -2,13 +2,13 @@ ! OsmoHLR example configuration ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level all debug - logging level linp error + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error ! line vty bind 0.0.0.0 diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index acf7e31..eb2f7ef 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -3,29 +3,29 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 0 - logging level all everything - logging level rtp notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index 8fa38ad..f0180d8 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -3,44 +3,44 @@ !! ! log file /data/osmo-msc.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level rll notice - logging level cc debug - logging level mm debug - logging level rr notice - logging level mncc debug - logging level pag notice - logging level msc notice - logging level mgcp debug - logging level ho notice - logging level db notice - logging level ref notice - logging level ctrl notice - logging level smpp debug - logging level ranap debug - logging level vlr debug - logging level iucs debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc debug + logging level mm debug + logging level rr notice + logging level mncc debug + logging level pag notice + logging level msc notice + logging level mgcp debug + logging level ho notice + logging level db notice + logging level ref notice + logging level ctrl notice + logging level smpp debug + logging level ranap debug + logging level vlr debug + logging level iucs debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug ! stats interval 5 ! diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg index f7d1396..50a1878 100644 --- a/ttcn3-msc-test/osmo-stp.cfg +++ b/ttcn3-msc-test/osmo-stp.cfg @@ -3,28 +3,28 @@ !! ! log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice ! line vty no login diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 0999c51..20dea6e 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -3,42 +3,42 @@ !! ! log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print file 1 - logging level all everything - logging level mm debug - logging level pag notice - logging level meas notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp info - logging level llc debug - logging level sndcp debug - logging level slhc notice - logging level ranap info - logging level sua info - logging level v42bis info - logging level lglobal info - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp debug - logging level lstats notice - logging level lgsup debug - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level mm debug + logging level pag notice + logging level meas notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp info + logging level llc debug + logging level sndcp debug + logging level slhc notice + logging level ranap info + logging level sua info + logging level v42bis info + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp debug + logging level lstats notice + logging level lgsup debug + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice ! stats interval 5 ! diff --git a/ttcn3-sip-test/osmo-sip-connector.cfg b/ttcn3-sip-test/osmo-sip-connector.cfg index db212ae..1834325 100644 --- a/ttcn3-sip-test/osmo-sip-connector.cfg +++ b/ttcn3-sip-test/osmo-sip-connector.cfg @@ -3,34 +3,34 @@ !! ! log file /data/osmo-sip-connector.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 0 - logging print file basename - logging level all everything - logging level sip debug - logging level mncc debug - logging level app debug - logging level call notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice - logging level ljibuf notice + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 0 + logging print file basename + logging level all everything + logging level sip debug + logging level mncc debug + logging level app debug + logging level call notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/11093 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: Id687e63c418e2e955ccbb92f2420a80fc0704ea4 Gerrit-Change-Number: 11093 Gerrit-PatchSet: 2 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 Sep 26 09:28:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:28:23 +0000 Subject: Change in osmo-bsc[master]: lcls: log channel type and lchan names on LCLS codec mismatch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11097 ) Change subject: lcls: log channel type and lchan names on LCLS codec mismatch ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11097/1/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11097/1/src/osmo-bsc/osmo_bsc_lcls.c at 276 PS1, Line 276: unrelated whitespace change. -- To view, visit https://gerrit.osmocom.org/11097 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: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Gerrit-Change-Number: 11097 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 09:28:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 09:29:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:29:12 +0000 Subject: Change in osmo-bsc[master]: fix LCLS during Assignment: actually use new TCH lchan In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11098 ) Change subject: fix LCLS during Assignment: actually use new TCH lchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11098 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: I8dd561d744d8081b5ac5ffa7635f17ac19bcda45 Gerrit-Change-Number: 11098 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 09:29: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 Sep 26 09:29:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:29:31 +0000 Subject: Change in osmo-bsc[master]: cosmetic: drop param from send_assignment_complete() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11099 ) Change subject: cosmetic: drop param from send_assignment_complete() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11099 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: I3c038d91a53c81d9fcf4ec62f853b59bb1ecd244 Gerrit-Change-Number: 11099 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 09: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 Wed Sep 26 09:29:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:29:40 +0000 Subject: Change in docker-playground[master]: root Makefile: add rules for ttcn3-hlr-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11043 ) Change subject: root Makefile: add rules for ttcn3-hlr-test ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11043 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: Idfd59c3faabeaa1af00df988513d5574c680a3bb Gerrit-Change-Number: 11043 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 26 Sep 2018 09:29: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 Sep 26 09:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 09:29:42 +0000 Subject: Change in docker-playground[master]: root Makefile: add rules for ttcn3-hlr-test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11043 ) Change subject: root Makefile: add rules for ttcn3-hlr-test ...................................................................... root Makefile: add rules for ttcn3-hlr-test Change-Id: Idfd59c3faabeaa1af00df988513d5574c680a3bb --- M Makefile 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/Makefile b/Makefile index f82e3f5..e224274 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,10 @@ osmo-ggsn-master: debian-jessie-build $(MAKE) -C osmo-ggsn-master +.PHONY: osmo-hlr-master +osmo-hlr-master: debian-jessie-build + $(MAKE) -C osmo-hlr-master + .PHONY: ttcn3-bsc-test ttcn3-bsc-test: debian-stretch-titan osmo-stp-master osmo-bsc-master osmo-bts-master ttcn3-bsc-test $(MAKE) -C ttcn3-bsc-test @@ -53,6 +57,10 @@ ttcn3-mgw-test: debian-stretch-titan osmo-mgw-master $(MAKE) -C ttcn3-mgw-test +.PHONY: ttcn3-hlr-test +ttcn3-hlr-test: debian-stretch-titan osmo-hlr-master + $(MAKE) -C ttcn3-hlr-test + .PHONY: sctp-test sctp-test: debian-jessie-build $(MAKE) -C sctp-test -- To view, visit https://gerrit.osmocom.org/11043 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: Idfd59c3faabeaa1af00df988513d5574c680a3bb Gerrit-Change-Number: 11043 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 09:53:05 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 26 Sep 2018 09:53:05 +0000 Subject: Change in osmo-bsc[master]: lcls: log channel type and lchan names on LCLS codec mismatch 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/11097 to look at the new patch set (#2). Change subject: lcls: log channel type and lchan names on LCLS codec mismatch ...................................................................... lcls: log channel type and lchan names on LCLS codec mismatch When a codec mismatch (lchan type or tch_mode does not match) occurs, we do not know which of the two lchan had which type or tch_mode. Lets print that information as well to make debugging easier. Change-Id: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/11097/2 -- To view, visit https://gerrit.osmocom.org/11097 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: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Gerrit-Change-Number: 11097 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 Sep 26 09:54:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 26 Sep 2018 09:54:39 +0000 Subject: Change in osmo-bsc[master]: lcls: log channel type and lchan names on LCLS codec mismatch In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11097 ) Change subject: lcls: log channel type and lchan names on LCLS codec mismatch ...................................................................... Patch Set 1: (1 comment) > (1 comment) Fixed. https://gerrit.osmocom.org/#/c/11097/1/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11097/1/src/osmo-bsc/osmo_bsc_lcls.c at 276 PS1, Line 276: > unrelated whitespace change. Done -- To view, visit https://gerrit.osmocom.org/11097 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: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Gerrit-Change-Number: 11097 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 26 Sep 2018 09:54:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 10:34:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 10:34:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW 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/11083 to look at the new patch set (#2). Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... bts: Add module parameters with tolerance to support real HW When we don't use trxcon (ie we run real HW) we cannot set some parameters like ms power level, so we need to relax template matching when we receive UL measurements in that case. This commit makes tests TC_meas_res_sign_tchf and TC_meas_res_sign_tchh_toa256 pass with motorola CXX and osmo-trx+osmo-bts-trx. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11083/2 -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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 Sep 26 10:44:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 10:44:02 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11102 Change subject: ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters ...................................................................... ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters Change-Id: I8e28d7c011f466d0eb2127f61032978c4e0bf16d --- M ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/02/11102/1 diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl index 7379528..579f645 100644 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl @@ -15,8 +15,12 @@ L1CTL_PortType.m_l1ctl_sock_path := "/data/unix_l2/osmocom_l2" BTS_Tests.mp_ctrl_ip := "${btsvty_ctrl_hostname}" BTS_Tests.mp_rxlev_exp := 1 -BTS_Tests.mp_tolerance_rxlev := 10; -BTS_Tests.mp_tolerance_rxqual := 1; +BTS_Tests.mp_ms_power_level_exp := 4 +BTS_Tests.mp_timing_offset_256syms_exp := 8000 +BTS_Tests.mp_tolerance_rxlev := 10 +BTS_Tests.mp_tolerance_rxqual := 1 +BTS_Tests.mp_tolerance_ms_power_level := 5 +BTS_Tests.mp_tolerance_timing_offset_256syms := 10000 BTS_Tests.mp_trx0_arfcn := 868 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/11102 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: I8e28d7c011f466d0eb2127f61032978c4e0bf16d Gerrit-Change-Number: 11102 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Sep 26 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 26 Sep 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_#258?= In-Reply-To: <65494795.284.1537888206748.JavaMail.jenkins@jenkins.osmocom.org> References: <65494795.284.1537888206748.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <797455607.333.1537974607001.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 flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l 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 %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.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_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 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_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_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 -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 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_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_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_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_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 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_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_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 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 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_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_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_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.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_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.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_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 Wed Sep 26 16:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 26 Sep 2018 16:15:04 +0000 Subject: Change in pysim[master]: utils: fix encoding/decoding of IMSI value 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/11073 to look at the new patch set (#2). Change subject: utils: fix encoding/decoding of IMSI value ...................................................................... utils: fix encoding/decoding of IMSI value When programming or reading a SIM with an IMSI shorter than 15, the IMSI value is incorrectly encoded/decoded. The code pads the the IMSI value with 0xF from the left but padding from the right would be correct. It also encodes the length as half the number of digits in the IMSI (rounded up). This isn't correct for even length IMSIs. With even length IMSIs, the odd/even parity bit bumps the last digit into an extra byte, which should be counted as well. - Fix endcoding of IMSI value - Fix decoding of IMSI value Change-Id: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Patch-by: Ben Foxmoore Closes: SYS#3552 --- M pySim/utils.py 1 file changed, 26 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/11073/2 -- To view, visit https://gerrit.osmocom.org/11073 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: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Gerrit-Change-Number: 11073 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 Sep 26 17:38:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:38:09 +0000 Subject: Change in pysim[master]: utils: fix encoding/decoding of IMSI value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11073 ) Change subject: utils: fix encoding/decoding of IMSI value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11073 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: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Gerrit-Change-Number: 11073 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 17:38: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 Sep 26 17:38:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:38:10 +0000 Subject: Change in pysim[master]: utils: fix encoding/decoding of IMSI value In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11073 ) Change subject: utils: fix encoding/decoding of IMSI value ...................................................................... utils: fix encoding/decoding of IMSI value When programming or reading a SIM with an IMSI shorter than 15, the IMSI value is incorrectly encoded/decoded. The code pads the the IMSI value with 0xF from the left but padding from the right would be correct. It also encodes the length as half the number of digits in the IMSI (rounded up). This isn't correct for even length IMSIs. With even length IMSIs, the odd/even parity bit bumps the last digit into an extra byte, which should be counted as well. - Fix endcoding of IMSI value - Fix decoding of IMSI value Change-Id: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Patch-by: Ben Foxmoore Closes: SYS#3552 --- M pySim/utils.py 1 file changed, 26 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index 17dc693..ba94702 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -49,11 +49,29 @@ def lpad(s, l, c='f'): return c * (l - len(s)) + s +def half_round_up(n): + return (n + 1)//2 + +# IMSI encoded format: +# For IMSI 0123456789ABCDE: +# +# | byte 1 | 2 upper | 2 lower | 3 upper | 3 lower | ... | 9 upper | 9 lower | +# | length in bytes | 0 | odd/even | 2 | 1 | ... | E | D | +# +# If the IMSI is less than 15 characters, it should be padded with 'f' from the end. +# +# The length is the total number of bytes used to encoded the IMSI. This includes the odd/even +# parity bit. E.g. an IMSI of length 14 is 8 bytes long, not 7, as it uses bytes 2 to 9 to +# encode itself. +# +# Because of this, an odd length IMSI fits exactly into len(imsi) + 1 // 2 bytes, whereas an +# even length IMSI only uses half of the last byte. + def enc_imsi(imsi): """Converts a string imsi into the value of the EF""" - l = (len(imsi) + 1) // 2 # Required bytes + l = half_round_up(len(imsi) + 1) # Required bytes - include space for odd/even indicator oe = len(imsi) & 1 # Odd (1) / Even (0) - ei = '%02x' % l + swap_nibbles(lpad('%01x%s' % ((oe<<3)|1, imsi), 16)) + ei = '%02x' % l + swap_nibbles('%01x%s' % ((oe<<3)|1, rpad(imsi, 15))) return ei def dec_imsi(ef): @@ -61,13 +79,15 @@ if len(ef) < 4: return None l = int(ef[0:2], 16) * 2 # Length of the IMSI string - swapped = swap_nibbles(ef[2:]) + l = l - 1 # Encoded length byte includes oe nibble + swapped = swap_nibbles(ef[2:]).rstrip('f') oe = (int(swapped[0])>>3) & 1 # Odd (1) / Even (0) - if oe: + if not oe: + # if even, only half of last byte was used l = l-1 - if l+1 > len(swapped): + if l != len(swapped) - 1: return None - imsi = swapped[1:l+2] + imsi = swapped[1:] return imsi def dec_iccid(ef): -- To view, visit https://gerrit.osmocom.org/11073 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: I9ae4ca4eb7c2965e601a7108843d052ff613beb9 Gerrit-Change-Number: 11073 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 Sep 26 17:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:42:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 58 PS2, Line 58: mp_tolerance_ms_power_level tolerance doesn't make sense here. the MS power level is instructed by the BTS to the MS, and the MS must transmit at the ordered power level back in uplink. There is no measurement involved. It is a digital value that must match. https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 59 PS2, Line 59: mp_tolerance_ms_actual_ta := 0; : integer mp_tolerance_timing_offset_256syms those two can be merged. As both the TA as well as the TOA256 are derived from the same timing measurement, there is only one source of determining timing distortion/error in the path. The 256syms value is of course 256 times the tolerance on the TA scale, which counts (if i remember correctly) in full symbols. https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 62 PS2, Line 62: mp_ms_power_level_exp the expected power level must always match the instructed power level, otherwise the BTS or MS are broken in some way. Making this value configurable doesn't appear to make much sense, IMHO. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 17:42:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 17:42:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:42:33 +0000 Subject: Change in osmo-bsc[master]: lcls: log channel type and lchan names on LCLS codec mismatch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11097 ) Change subject: lcls: log channel type and lchan names on LCLS codec mismatch ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11097 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: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Gerrit-Change-Number: 11097 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 26 Sep 2018 17:42: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 Sep 26 17:42:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:42:37 +0000 Subject: Change in osmo-bsc[master]: lcls: log channel type and lchan names on LCLS codec mismatch In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11097 ) Change subject: lcls: log channel type and lchan names on LCLS codec mismatch ...................................................................... lcls: log channel type and lchan names on LCLS codec mismatch When a codec mismatch (lchan type or tch_mode does not match) occurs, we do not know which of the two lchan had which type or tch_mode. Lets print that information as well to make debugging easier. Change-Id: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Related: OS#1602 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 00c3296..b8bf601 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -276,13 +276,24 @@ if (conn->lchan->type != conn->lcls.other->lchan->type && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (channel type)\n"); + LOGPFSM(conn->lcls.fi, + "Not enabling LS due to channel type mismatch: %s:%s != %s:%s\n", + gsm_lchan_name(conn->lchan), + gsm_chan_t_name(conn->lchan->type), + gsm_lchan_name(conn->lcls.other->lchan), + gsm_chan_t_name(conn->lcls.other->lchan->type)); return false; } if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode && conn->sccp.msc->lcls_codec_mismatch_allow == false) { - LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (TCH-Mode)\n"); + LOGPFSM(conn->lcls.fi, + "Not enabling LS due to TCH-mode mismatch: %s:%s != %s:%s\n", + gsm_lchan_name(conn->lchan), + gsm48_chan_mode_name(conn->lchan->tch_mode), + gsm_lchan_name(conn->lcls.other->lchan), + gsm48_chan_mode_name(conn->lcls.other->lchan-> + tch_mode)); return false; } -- To view, visit https://gerrit.osmocom.org/11097 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: I3fd22fef50d8944ca8c003c6114fdda37417b2ea Gerrit-Change-Number: 11097 Gerrit-PatchSet: 3 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 Sep 26 17:42:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:42:37 +0000 Subject: Change in osmo-bsc[master]: fix LCLS during Assignment: actually use new TCH lchan In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11098 ) Change subject: fix LCLS during Assignment: actually use new TCH lchan ...................................................................... fix LCLS during Assignment: actually use new TCH lchan In assignment_success(), don't trigger lcls_apply_config() before the conn->lchan points at the actual new voice lchan. The entire LCLS code relies on conn->lchan. The assignment FSM wants to point conn->lchan to the new lchan only after it is sure that sending the Assignment Complete to the MSC was successful. However, a failure is a) very unlikely and b) if sending to the MSC fails we might as well tear the whole conn down anyway. Now, if sending to the MSC fails, release the lchan and the conn should clean itself up. Related: OS#1602 Change-Id: I8dd561d744d8081b5ac5ffa7635f17ac19bcda45 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 13 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 5304d6c..a7564e0 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -200,19 +200,23 @@ static void assignment_success(struct gsm_subscriber_connection *conn) { - /* apply LCLS configuration (if any) */ - lcls_apply_config(conn); - - send_assignment_complete(conn, conn->assignment.new_lchan); - /* If something went wrong during send_assignment_complete(), the fi will be gone from - * error handling in there. Almost a success, but then again the whole thing failed. */ - if (!conn->assignment.fi) - return; - /* Take on the new lchan */ gscon_change_primary_lchan(conn, conn->assignment.new_lchan); conn->assignment.new_lchan = NULL; + /* apply LCLS configuration (if any) */ + lcls_apply_config(conn); + + send_assignment_complete(conn, conn->lchan); + /* If something went wrong during send_assignment_complete(), the fi will be gone from + * error handling in there. Almost a success, but then again the whole thing failed. */ + if (!conn->assignment.fi) { + /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, + * the conn will notice that its primary lchan is gone and should clean itself up. */ + lchan_release(conn->lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + return; + } + /* Rembered this only for error handling: should assignment fail, assignment_reset() will release * the MGW endpoint right away. If successful, the conn continues to use the endpoint. */ conn->assignment.created_ci_for_msc = NULL; -- To view, visit https://gerrit.osmocom.org/11098 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: I8dd561d744d8081b5ac5ffa7635f17ac19bcda45 Gerrit-Change-Number: 11098 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 Sep 26 17:42:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 17:42:38 +0000 Subject: Change in osmo-bsc[master]: cosmetic: drop param from send_assignment_complete() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11099 ) Change subject: cosmetic: drop param from send_assignment_complete() ...................................................................... cosmetic: drop param from send_assignment_complete() After previous patch I8dd561d744d8081b5ac5ffa7635f17ac19bcda45, all callers pass conn->lchan to send_assignment_complete(), so there is no need to pass it separately from conn. Change-Id: I3c038d91a53c81d9fcf4ec62f853b59bb1ecd244 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a7564e0..2410adb 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -129,7 +129,7 @@ } } -static void send_assignment_complete(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan) +static void send_assignment_complete(struct gsm_subscriber_connection *conn) { int rc; struct gsm0808_speech_codec sc; @@ -139,7 +139,7 @@ int perm_spch = 0; uint8_t chosen_channel; struct msgb *resp; - struct gsm_lchan *lchan = new_lchan; + struct gsm_lchan *lchan = conn->lchan; struct osmo_fsm_inst *fi = conn->fi; chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->tch_mode); @@ -207,7 +207,7 @@ /* apply LCLS configuration (if any) */ lcls_apply_config(conn); - send_assignment_complete(conn, conn->lchan); + send_assignment_complete(conn); /* If something went wrong during send_assignment_complete(), the fi will be gone from * error handling in there. Almost a success, but then again the whole thing failed. */ if (!conn->assignment.fi) { @@ -348,7 +348,7 @@ " requested chan_mode=%s; current lchan is %s\n", gsm48_chan_mode_name(req->chan_mode), gsm_lchan_name(conn->lchan)); - send_assignment_complete(conn, conn->lchan); + send_assignment_complete(conn); return; } -- To view, visit https://gerrit.osmocom.org/11099 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: I3c038d91a53c81d9fcf4ec62f853b59bb1ecd244 Gerrit-Change-Number: 11099 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 Sep 26 18:01:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 18:01:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 58 PS2, Line 58: mp_tolerance_ms_power_level > tolerance doesn't make sense here. [?] If I recall correctly, what I read is that the value should match only if the MS supports it, and if the MS doesn't support it, then it should take a lower one the closest to the announced max value. I'll cross-check that. I think I also saw at least once that the motorola phone announced a different power level (0?). I'll do some more tests and see how it behaves more in detail. https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 59 PS2, Line 59: mp_tolerance_ms_actual_ta := 0; : integer mp_tolerance_timing_offset_256syms > those two can be merged. [?] >From what I understand from your comment, then it doesn't matter which of the 2 values/variables we use since they have the same precision (despite one being in jumps of 256?). Or did I understand it incorrectly and the 256syms one has more precision? https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 62 PS2, Line 62: mp_ms_power_level_exp > the expected power level must always match the instructed power level, otherwise the BTS or MS are b [?] As I said, I'll test it a bit more and come back with some descirption or change. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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, 26 Sep 2018 18:01:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 18:43:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 18:43:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Account for elapsed time in paging timer Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11103 Change subject: bts: Account for elapsed time in paging timer ...................................................................... bts: Account for elapsed time in paging timer Previous implementation always waited for "interval" time until sending next paging cmd, and didn't finish the test until all expected paging cmds were sent. As a result, each time it triggered it accumulated some delay which could go from 2 seconds to 12 seconds depending on machine load. As a consequence, the expected number of paging cmd messages to be sent in 20 seconds was being sent in 22-32 seconds, hence changing the load on osmo-bts and as a result changing the test results. Low threshold needs to be adapted since now they are sent in exactly 20 seconds max and the load handled by osmo-bts is bigger. Fixes: OS#3025 Change-Id: I9651136d6810420e0a4d887bfb11c913a24f0457 --- M bts/BTS_Tests.ttcn 1 file changed, 44 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/11103/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index aa402d1..809a403 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1687,26 +1687,16 @@ } var float pch_blocks_per_sec := max_pch_imsi_per_sec * cfg.load_factor; var float interval := 1.0 / pch_blocks_per_sec; - log("pch_blocks_per_sec=", pch_blocks_per_sec, " interval=", interval); + var float time_total := 20.0; + var integer pkt_total := float2int(time_total * pch_blocks_per_sec); + log("pch_blocks_total=", pkt_total," pch_blocks_per_sec=", pch_blocks_per_sec, " interval=", interval); - for (var integer i := 0; i < float2int(20.0/interval); i := i+1) { - /* build mobile Identity */ - var MobileL3_CommonIE_Types.MobileIdentityLV mi; - if (cfg.use_tmsi) { - mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4))); - } else { - mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(i))); - } - var octetstring mi_enc_lv := enc_MobileIdentityLV(mi); - var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1); + timer T_total := 300.0; /* big value (far bigger than time_total), used to count elapsed time */ + T_total.start; - /* Send RSL PAGING COMMAND */ - RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, i mod 4))); - st.num_paging_sent := st.num_paging_sent + 1; - - /* Wait for interval to next PAGING COMMAND */ - timer T_itv := interval; - T_itv.start; + timer T_itv := 0.0; + T_itv.start; + while (st.num_paging_sent < pkt_total) { alt { /* check for presence of CCCH LOAD IND (paging load) */ [cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) { @@ -1725,7 +1715,40 @@ /* check if paging requests arrive on Um side */ [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, cfg); [] L1CTL.receive { repeat; } - [] T_itv.timeout { } + [] T_itv.timeout { + /* Send paging cmds based on elapsed time */ + var integer new_sent := f_min(pkt_total, float2int(T_total.read * pch_blocks_per_sec) + 1); + while (st.num_paging_sent < new_sent) { + /* build mobile Identity */ + var MobileL3_CommonIE_Types.MobileIdentityLV mi; + if (cfg.use_tmsi) { + mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4))); + } else { + mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(st.num_paging_sent))); + } + var octetstring mi_enc_lv := enc_MobileIdentityLV(mi); + var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1); + + /* Send RSL PAGING COMMAND */ + RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, st.num_paging_sent mod 4))); + + st.num_paging_sent := st.num_paging_sent + 1; + } + if (st.num_paging_sent < pkt_total) { + /* Wait for interval to next PAGING COMMAND */ + var float time_now := T_total.read; + var float next_sched := int2float(st.num_paging_sent)*interval; + if (next_sched > time_now) { + T_itv.start(next_sched - time_now); + } else { + T_itv.start(0.0); + } + } else { + /* We are done, no need to keep counting */ + T_total.stop; + } + } + [] T_total.timeout { } [] as_rsl_res_ind(); } } @@ -1816,7 +1839,7 @@ var PagingTestState st := f_TC_paging(cfg); /* We expect about 80-85% to pass, given that we can fill the paging buffer of 200 * slots and will fully drain that buffer before returning */ - var template integer tpl := (st.num_paging_sent*80/100 .. st.num_paging_sent *85/100); + var template integer tpl := (st.num_paging_sent*78/100 .. st.num_paging_sent *85/100); if (not match(st.num_paging_rcv_ids, tpl)) { setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); } else { @@ -1842,7 +1865,7 @@ var PagingTestState st := f_TC_paging(cfg); /* We expect about 70% to pass, given that we can fill the paging buffer of 200 * slots and will fully drain that buffer before returning */ - var template integer tpl := (st.num_paging_sent*66/100 .. st.num_paging_sent *72/100); + var template integer tpl := (st.num_paging_sent*64/100 .. st.num_paging_sent *72/100); if (not match(st.num_paging_rcv_ids, tpl)) { setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); } else { -- To view, visit https://gerrit.osmocom.org/11103 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: I9651136d6810420e0a4d887bfb11c913a24f0457 Gerrit-Change-Number: 11103 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 Sep 26 18:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 18:55:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 58 PS2, Line 58: mp_tolerance_ms_power_level > If I recall correctly, what I read is that the value should match only if the MS supports it, and if [?] Yes, I get power level 0 sometimes (using mp_ms_power_level_exp=7 and mp_tolerance_ms_power_level=0): "BTS_Tests.ttcn:1299 Matching on port RSL .ies[4].body.l1_info.ms_power_lvl := 0 with (7 .. 7) unmatched: First message in the queue does not match the template:" -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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, 26 Sep 2018 18:55:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 18:58:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 18:58:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 58 PS2, Line 58: mp_tolerance_ms_power_level > Yes, I get power level 0 sometimes (using mp_ms_power_level_exp=7 and mp_tolerance_ms_power_level=0) [?] And then later on (I check by running test with mp_ms_power_level_exp=0 and mp_tolerance_ms_power_level=0), it starts sending with power_lvl 7: ".ies[4].body.l1_info.ms_power_lvl := 7" -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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, 26 Sep 2018 18:58:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 19:13:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 26 Sep 2018 19:13:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 59 PS2, Line 59: mp_tolerance_ms_actual_ta := 0; : integer mp_tolerance_timing_offset_256syms > From what I understand from your comment, then it doesn't matter which of the 2 values/variables we [?] Regarding this comment, now I understood that only the 2 tolerance ones are to be merged, not the expected values. However, my previous question still applies somehow: can the 256syms be non multiple of 256, ie. is it more precise? Then I should use that one and the ms_actual_ta is clamped from the 256syms one. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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, 26 Sep 2018 19:13: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 Sep 26 19:53:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 19:53:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Account for elapsed time in paging timer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11103 ) Change subject: bts: Account for elapsed time in paging timer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11103 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: I9651136d6810420e0a4d887bfb11c913a24f0457 Gerrit-Change-Number: 11103 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Sep 2018 19:53:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 19:53:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 19:53:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Account for elapsed time in paging timer In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11103 ) Change subject: bts: Account for elapsed time in paging timer ...................................................................... bts: Account for elapsed time in paging timer Previous implementation always waited for "interval" time until sending next paging cmd, and didn't finish the test until all expected paging cmds were sent. As a result, each time it triggered it accumulated some delay which could go from 2 seconds to 12 seconds depending on machine load. As a consequence, the expected number of paging cmd messages to be sent in 20 seconds was being sent in 22-32 seconds, hence changing the load on osmo-bts and as a result changing the test results. Low threshold needs to be adapted since now they are sent in exactly 20 seconds max and the load handled by osmo-bts is bigger. Fixes: OS#3025 Change-Id: I9651136d6810420e0a4d887bfb11c913a24f0457 --- M bts/BTS_Tests.ttcn 1 file changed, 44 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index aa402d1..809a403 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1687,26 +1687,16 @@ } var float pch_blocks_per_sec := max_pch_imsi_per_sec * cfg.load_factor; var float interval := 1.0 / pch_blocks_per_sec; - log("pch_blocks_per_sec=", pch_blocks_per_sec, " interval=", interval); + var float time_total := 20.0; + var integer pkt_total := float2int(time_total * pch_blocks_per_sec); + log("pch_blocks_total=", pkt_total," pch_blocks_per_sec=", pch_blocks_per_sec, " interval=", interval); - for (var integer i := 0; i < float2int(20.0/interval); i := i+1) { - /* build mobile Identity */ - var MobileL3_CommonIE_Types.MobileIdentityLV mi; - if (cfg.use_tmsi) { - mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4))); - } else { - mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(i))); - } - var octetstring mi_enc_lv := enc_MobileIdentityLV(mi); - var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1); + timer T_total := 300.0; /* big value (far bigger than time_total), used to count elapsed time */ + T_total.start; - /* Send RSL PAGING COMMAND */ - RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, i mod 4))); - st.num_paging_sent := st.num_paging_sent + 1; - - /* Wait for interval to next PAGING COMMAND */ - timer T_itv := interval; - T_itv.start; + timer T_itv := 0.0; + T_itv.start; + while (st.num_paging_sent < pkt_total) { alt { /* check for presence of CCCH LOAD IND (paging load) */ [cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) { @@ -1725,7 +1715,40 @@ /* check if paging requests arrive on Um side */ [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, cfg); [] L1CTL.receive { repeat; } - [] T_itv.timeout { } + [] T_itv.timeout { + /* Send paging cmds based on elapsed time */ + var integer new_sent := f_min(pkt_total, float2int(T_total.read * pch_blocks_per_sec) + 1); + while (st.num_paging_sent < new_sent) { + /* build mobile Identity */ + var MobileL3_CommonIE_Types.MobileIdentityLV mi; + if (cfg.use_tmsi) { + mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4))); + } else { + mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(st.num_paging_sent))); + } + var octetstring mi_enc_lv := enc_MobileIdentityLV(mi); + var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1); + + /* Send RSL PAGING COMMAND */ + RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, st.num_paging_sent mod 4))); + + st.num_paging_sent := st.num_paging_sent + 1; + } + if (st.num_paging_sent < pkt_total) { + /* Wait for interval to next PAGING COMMAND */ + var float time_now := T_total.read; + var float next_sched := int2float(st.num_paging_sent)*interval; + if (next_sched > time_now) { + T_itv.start(next_sched - time_now); + } else { + T_itv.start(0.0); + } + } else { + /* We are done, no need to keep counting */ + T_total.stop; + } + } + [] T_total.timeout { } [] as_rsl_res_ind(); } } @@ -1816,7 +1839,7 @@ var PagingTestState st := f_TC_paging(cfg); /* We expect about 80-85% to pass, given that we can fill the paging buffer of 200 * slots and will fully drain that buffer before returning */ - var template integer tpl := (st.num_paging_sent*80/100 .. st.num_paging_sent *85/100); + var template integer tpl := (st.num_paging_sent*78/100 .. st.num_paging_sent *85/100); if (not match(st.num_paging_rcv_ids, tpl)) { setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); } else { @@ -1842,7 +1865,7 @@ var PagingTestState st := f_TC_paging(cfg); /* We expect about 70% to pass, given that we can fill the paging buffer of 200 * slots and will fully drain that buffer before returning */ - var template integer tpl := (st.num_paging_sent*66/100 .. st.num_paging_sent *72/100); + var template integer tpl := (st.num_paging_sent*64/100 .. st.num_paging_sent *72/100); if (not match(st.num_paging_rcv_ids, tpl)) { setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); } else { -- To view, visit https://gerrit.osmocom.org/11103 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: I9651136d6810420e0a4d887bfb11c913a24f0457 Gerrit-Change-Number: 11103 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 Sep 26 19:59:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Sep 2018 19:59:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 58 PS2, Line 58: mp_tolerance_ms_power_level > If I recall correctly, what I read is that the value should match only if the MS supports it, and if [?] Yes, it is correct that a MS that doesn't support the given power level will return a different (supported) one. However, the BTS/BSC will know the power capabilities of the phone, and we are testing with a known phone. So I'm saying we know the setup well enough to not ever ask for a power level not supported by the device. https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 58 PS2, Line 58: mp_tolerance_ms_power_level > Yes, I get power level 0 sometimes (using mp_ms_power_level_exp=7 and mp_tolerance_ms_power_level=0) [?] is that sometimes in between, or is that only the first message ever sent by the phone? Maybe it's just the initial state that's somehow broken? Or the power control loop needs a few iterations until it arrives at the intended value? In this case we could simply exclude the first N messages from matching. https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 59 PS2, Line 59: mp_tolerance_ms_actual_ta := 0; : integer mp_tolerance_timing_offset_256syms > Regarding this comment, now I understood that only the 2 tolerance ones are to be merged, not the ex [?] the 256syms can of course be non-multiple of 256. But you can specify the tolerance in units of 1/256th (e.g. 512 for two symbols), and then you can compute the TA tolerance as 512/256=2 and the toa256 tolerance is 512. https://gerrit.osmocom.org/#/c/11083/2/bts/BTS_Tests.ttcn at 62 PS2, Line 62: mp_ms_power_level_exp > As I said, I'll test it a bit more and come back with some descirption or change. there is of course the power control loop, and we may have bugs in the power control loop implementation. Also, there are differences in how the different BTS models / PHY implementations handle this. The BSC may also instruct the BTS to bypass BTS-side power control loop, whihc AFAIK is broken / not implemented. I'm not arguing that your observations / results are wrong. I'm just arguing that somehow our code is broken / incomplete and we shouldn't adjust this by increasing the test tolerance, but by looking for the actual issue. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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, 26 Sep 2018 19:59:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 21:45:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Sep 2018 21:45:39 +0000 Subject: Change in libosmocore[master]: utils/osmo-config-merge: explicitly return from main() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11104 Change subject: utils/osmo-config-merge: explicitly return from main() ...................................................................... utils/osmo-config-merge: explicitly return from main() This change fixes the following compiler warning: osmo-config-merge.c: In function ?main?: osmo-config-merge.c:268:1: warning: control reaches end of non-void function [-Wreturn-type] Despite it isn't critical, let's get rid of this warning. Change-Id: I7a80a85c8b3180dc086cd9fd20356aab16ea8100 --- M utils/osmo-config-merge.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11104/1 diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index 3762c67..c76e42d 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -265,4 +265,6 @@ /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */ talloc_free(patch_tree); talloc_free(base_tree); + + return 0; } -- To view, visit https://gerrit.osmocom.org/11104 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: I7a80a85c8b3180dc086cd9fd20356aab16ea8100 Gerrit-Change-Number: 11104 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 26 22:55:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Sep 2018 22:55:56 +0000 Subject: Change in libosmocore[master]: (WIP) libosmogsm: introduce message definition and verification helpers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11105 Change subject: (WIP) libosmogsm: introduce message definition and verification helpers ...................................................................... (WIP) libosmogsm: introduce message definition and verification helpers Change-Id: Idef83b0c53b17503a64d7ab7422184ca4b60be57 --- M include/Makefile.am A include/osmocom/gsm/tlv_msg_def.h M src/gsm/Makefile.am A src/gsm/tlv_msg_def.c M tests/Makefile.am M tests/testsuite.at A tests/tlv/tlv_msg_def_test.c A tests/tlv/tlv_msg_def_test.ok 8 files changed, 323 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/11105/1 diff --git a/include/Makefile.am b/include/Makefile.am index 19695d1..ec56054 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -121,6 +121,7 @@ osmocom/gsm/rxlev_stat.h \ osmocom/gsm/sysinfo.h \ osmocom/gsm/tlv.h \ + osmocom/gsm/tlv_msg_def.h \ osmocom/sim/class_tables.h \ osmocom/sim/sim.h diff --git a/include/osmocom/gsm/tlv_msg_def.h b/include/osmocom/gsm/tlv_msg_def.h new file mode 100644 index 0000000..b0c108e --- /dev/null +++ b/include/osmocom/gsm/tlv_msg_def.h @@ -0,0 +1,41 @@ +#pragma once + +#include + +#include +#include + +/*! \addtogroup tlv + * @{ + * \file tlv_msg_def.h */ + +/*! Marks IE as optional / conditional */ +#define TLV_IE_FLAG_OPTIONAL (1 << 0) +/*! Marks IE as exclusive (i.e. this IE shall not repeat within a message) */ +#define TLV_IE_FLAG_EXCLUSIVE (1 << 1) +/*! Marks IE as complex (i.e. this IE may contain TLV-based payload itself) */ +#define TLV_IE_FLAG_COMPLEX (1 << 2) + +/*! Definition of a single IE (Information Element) */ +struct tlv_ie_def { + /*! Unique IE identifier */ + uint8_t iei; + /*! TLV type (e.g. T, TV, TvLV) */ + struct tlv_def tlv_def; + /*! Meta info (see \ref TLV_IE_FLAG_*) */ + uint8_t flags; +}; + +/*! Definition of a message group */ +struct tlv_msg_group_def { + /*! Human-readable name of a message group definition */ + const char *name; + /*! The \ref value-string list of all possible message types */ + const struct value_string *msg_names; + /*! The \ref value-string list of all possible IEs */ + const struct value_string *iei_names; + /*! List of expected (mandatory and optional) IEs */ + const struct tlv_ie_def *ie_defs[256]; +}; + +/*! @} */ diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 29299a6..25a7d5c 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -30,7 +30,8 @@ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ gsup.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ - gsm23003.c mncc.c bts_features.c oap_client.c + gsm23003.c mncc.c bts_features.c oap_client.c \ + tlv_msg_def.c libgsmint_la_LDFLAGS = -no-undefined libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la diff --git a/src/gsm/tlv_msg_def.c b/src/gsm/tlv_msg_def.c new file mode 100644 index 0000000..1eae99c --- /dev/null +++ b/src/gsm/tlv_msg_def.c @@ -0,0 +1,50 @@ +/*! \file tlv_msg_def.c + * Message definition and verification helpers */ +/* + * (C) 2018 by Vadim Yanitskiy + * + * 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, see . + * + */ + +#include +#include + +#include + +#include +#include + +/*! \addtogroup tlv + * @{ + * Osmocom message definition and verification helpers + * + * In almost all of the TLV based protocols we deal with (OML, RSL, + * BSSAP, RR/CC/MM/...) the specification of the individual messages + * always includes a statement on which IEs are mandatory, which are + * conditional, and which are optional. + * + * This module provides the message definition helpers, which can be + * used to implicitly describe and verify the structure of TLV-based + * messages. + * + * \file tlv_msg_def.c */ + + + +/*! @} */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 18d4bb4..201b2d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ codec/codec_ecu_fr_test timer/clk_override_test \ oap/oap_client_test \ logging/logging_vty_test \ + tlv/tlv_msg_def_test \ $(NULL) if ENABLE_MSGFILE @@ -179,6 +180,9 @@ tlv_tlv_test_SOURCES = tlv/tlv_test.c tlv_tlv_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +tlv_tlv_msg_def_test_SOURCES = tlv/tlv_msg_def_test.c +tlv_tlv_msg_def_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la + gsup_gsup_test_SOURCES = gsup/gsup_test.c gsup_gsup_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la @@ -274,7 +278,8 @@ sercomm/sercomm_test.ok prbs/prbs_test.ok \ gsm23003/gsm23003_test.ok \ timer/clk_override_test.ok \ - oap/oap_client_test.ok oap/oap_client_test.err + oap/oap_client_test.ok oap/oap_client_test.err \ + tlv/tlv_msg_def_test.ok DISTCLEANFILES = atconfig atlocal conv/gsm0503_test_vectors.c BUILT_SOURCES = conv/gsm0503_test_vectors.c diff --git a/tests/testsuite.at b/tests/testsuite.at index a1cf98a..1a5b96a 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -253,6 +253,12 @@ AT_CHECK([$abs_top_builddir/tests/tlv/tlv_test], [0], [expout], [ignore]) AT_CLEANUP +AT_SETUP([tlv_msg_def]) +AT_KEYWORDS([tlv_msg_def]) +cat $abs_srcdir/tlv/tlv_msg_def_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/tlv/tlv_msg_def_test], [0], [expout], [ignore]) +AT_CLEANUP + AT_SETUP([gsup]) AT_KEYWORDS([gsup]) cat $abs_srcdir/gsup/gsup_test.ok > expout diff --git a/tests/tlv/tlv_msg_def_test.c b/tests/tlv/tlv_msg_def_test.c new file mode 100644 index 0000000..f16d1cd --- /dev/null +++ b/tests/tlv/tlv_msg_def_test.c @@ -0,0 +1,216 @@ +#include +#include + +#include +#include + +#define TEST_MSG_ITEM(msg) msg, sizeof(msg) +#define MSGT_IES_ITEM(msgt, ies) [msgt] = (ies) +#define TEST_MSGT_GEN(type, sub_type) ((type << 2) | sub_type) + +/* Inspired by 3GPP TS 29.002, chapter 12 */ +enum test_msg_type { + TEST_MSGT_MAP_SRI_FOR_SM_REQ = TEST_MSGT_GEN(0x01, 1), + TEST_MSGT_MAP_SRI_FOR_SM_RES = TEST_MSGT_GEN(0x01, 2), + TEST_MSGT_MAP_SRI_FOR_SM_ERR = TEST_MSGT_GEN(0x01, 3), +}; +static const struct value_string test_msgt_names[] = { + OSMO_VALUE_STRING(TEST_MSGT_MAP_SRI_FOR_SM_REQ), + OSMO_VALUE_STRING(TEST_MSGT_MAP_SRI_FOR_SM_RES), + OSMO_VALUE_STRING(TEST_MSGT_MAP_SRI_FOR_SM_ERR), + { 0, NULL } +}; + +enum test_msg_ies { + TEST_MSG_SMSC_ADDR_IE = 0x01, + TEST_MSG_NODE_ADDR_IE = 0x02, + TEST_MSG_SM_RP_RPI_IE = 0x03, + TEST_MSG_MSISDN_IE = 0x04, + TEST_MSG_IMSI_IE = 0x05, + TEST_MSG_CAUSE_IE = 0x06, +}; +static const struct value_string test_msg_iei_names[] = { + OSMO_VALUE_STRING(TEST_MSG_SMSC_ADDR_IE), + OSMO_VALUE_STRING(TEST_MSG_NODE_ADDR_IE), + OSMO_VALUE_STRING(TEST_MSG_SM_RP_RPI_IE), + OSMO_VALUE_STRING(TEST_MSG_MSISDN_IE), + OSMO_VALUE_STRING(TEST_MSG_IMSI_IE), + OSMO_VALUE_STRING(TEST_MSG_CAUSE_IE), + { 0, NULL } +}; + +/* IE definitions */ +static const struct tlv_ie_def map_sriForSM_req_ies[] = { + { + .iei = TEST_MSG_MSISDN_IE, + .tlv_def = { TLV_TYPE_TLV }, + .flags = TLV_IE_FLAG_EXCLUSIVE, + }, + { + .iei = TEST_MSG_SM_RP_RPI_IE, + .tlv_def = { TLV_TYPE_TV }, + .flags = TLV_IE_FLAG_EXCLUSIVE, + }, + { + .iei = TEST_MSG_SMSC_ADDR_IE, + .tlv_def = { TLV_TYPE_TLV }, + .flags = TLV_IE_FLAG_EXCLUSIVE, + }, + { + .iei = TEST_MSG_IMSI_IE, + .tlv_def = { TLV_TYPE_TLV }, + .flags = (TLV_IE_FLAG_EXCLUSIVE | TLV_IE_FLAG_OPTIONAL), + }, +}; + +static const struct tlv_ie_def map_sriForSM_res_ies[] = { + { + .iei = TEST_MSG_IMSI_IE, + .tlv_def = { TLV_TYPE_TLV }, + .flags = TLV_IE_FLAG_EXCLUSIVE, + }, + { + .iei = TEST_MSG_NODE_ADDR_IE, + .tlv_def = { TLV_TYPE_TLV }, + .flags = TLV_IE_FLAG_EXCLUSIVE, + }, +}; + +static const struct tlv_ie_def map_sriForSM_err_ies[] = { + { + .iei = TEST_MSG_CAUSE_IE, + .tlv_def = { TLV_TYPE_TLV }, + }, +}; + +/* "SRI-FOR-SM" message group (REQ, RES, ERR) definition */ +static const struct tlv_msg_group_def map_sriForSM_def = { + .name = "MAP-MO-ForwardSM", + .msg_names = test_msgt_names, + .iei_names = test_msg_iei_names, + + /* IEs according to section 12.1 */ + .ie_defs = { + MSGT_IES_ITEM(TEST_MSGT_MAP_SRI_FOR_SM_REQ, + map_sriForSM_req_ies), + MSGT_IES_ITEM(TEST_MSGT_MAP_SRI_FOR_SM_RES, + map_sriForSM_res_ies), + MSGT_IES_ITEM(TEST_MSGT_MAP_SRI_FOR_SM_ERR, + map_sriForSM_err_ies), + }, +}; + +/* A valid test set of hand-crafted messages */ +static const uint8_t map_sriForSM_enc_req_valid[] = { + TEST_MSGT_MAP_SRI_FOR_SM_REQ, + TEST_MSG_MSISDN_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x65, 0x75, 0x03, 0x28, 0x25, + TEST_MSG_SMSC_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x89, 0x00, 0x00, 0x10, + TEST_MSG_SM_RP_RPI_IE, 0x00, /* TV, M */ +}; +static const uint8_t map_sriForSM_enc_res_valid[] = { + TEST_MSGT_MAP_SRI_FOR_SM_RES, + TEST_MSG_IMSI_IE, 0x08, /* TLV, M */ + 0x46, 0x00, 0x44, 0x31, 0x60, 0x13, 0x03, 0xf5, + TEST_MSG_NODE_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x15, 0x08, 0x00, 0x40, +}; +static const uint8_t map_sriForSM_enc_err_valid[] = { + TEST_MSGT_MAP_SRI_FOR_SM_ERR, + TEST_MSG_CAUSE_IE, 0x04, /* TLV, M */ + 0xde, 0xad, 0xbe, 0xef, +}; + +/* Unknown and optional IEs */ +static const uint8_t map_sriForSM_enc_req_valid_optional[] = { + TEST_MSGT_MAP_SRI_FOR_SM_REQ, + TEST_MSG_MSISDN_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x65, 0x75, 0x03, 0x28, 0x25, + TEST_MSG_IMSI_IE, 0x08, /* TLV, O (optional) */ + 0x46, 0x00, 0x44, 0x31, 0x60, 0x13, 0x03, 0xf5, + TEST_MSG_SMSC_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x89, 0x00, 0x00, 0x10, + TEST_MSG_SM_RP_RPI_IE, 0x00, /* TV, M */ +}; +static const uint8_t map_sriForSM_enc_res_valid_unknown[] = { + TEST_MSGT_MAP_SRI_FOR_SM_RES, + 0x99, 0x03, /* Unknown IE (considered as TLV) */ + 0xff, 0xff, 0xff, + TEST_MSG_IMSI_IE, 0x08, /* TLV, M */ + 0x46, 0x00, 0x44, 0x31, 0x60, 0x13, 0x03, 0xf5, + TEST_MSG_NODE_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x15, 0x08, 0x00, 0x40, +}; + +/* Missing mandatory IE(s) */ +static const uint8_t map_sriForSM_enc_req_invalid_miss[] = { + TEST_MSGT_MAP_SRI_FOR_SM_REQ, + TEST_MSG_MSISDN_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x65, 0x75, 0x03, 0x28, 0x25, + TEST_MSG_SMSC_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x89, 0x00, 0x00, 0x10, +}; +static const uint8_t map_sriForSM_enc_res_invalid_miss[] = { + TEST_MSGT_MAP_SRI_FOR_SM_RES, + TEST_MSG_NODE_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x15, 0x08, 0x00, 0x40, +}; + +/* TLV vs TV mismatch */ +static const uint8_t map_sriForSM_enc_req_invalid_tv_vs_tlv[] = { + TEST_MSGT_MAP_SRI_FOR_SM_REQ, + TEST_MSG_MSISDN_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x65, 0x75, 0x03, 0x28, 0x25, + TEST_MSG_SMSC_ADDR_IE, 0x07, /* TLV, M */ + 0x91, 0x52, 0x75, 0x89, 0x00, 0x00, 0x10, + TEST_MSG_SM_RP_RPI_IE, 0x04, /* TLV, M (incorrect) */ + 0xde, 0xad, 0xbe, 0xef, +}; + +/* Complete test set of hand-crafted messages */ +static const struct test_msg_def { + const char *name; + const uint8_t *data; + size_t data_len; +} map_sriForSM_enc_test_set[] = { + { + "MAP-SRI-FOR-SM Request (valid, mandatory IEs only)", + TEST_MSG_ITEM(map_sriForSM_enc_req_valid), + }, + { + "MAP-SRI-FOR-SM Response (valid, mandatory IEs only)", + TEST_MSG_ITEM(map_sriForSM_enc_res_valid), + }, + { + "MAP-SRI-FOR-SM Error (valid, mandatory IEs only)", + TEST_MSG_ITEM(map_sriForSM_enc_err_valid), + }, + { + "MAP-SRI-FOR-SM Request (valid, optional IEs)", + TEST_MSG_ITEM(map_sriForSM_enc_req_valid_optional), + }, + { + "MAP-SRI-FOR-SM Response (valid, unknown IEs)", + TEST_MSG_ITEM(map_sriForSM_enc_res_valid_unknown), + }, + { + "MAP-SRI-FOR-SM Request (invalid, missing mandatory IEs)", + TEST_MSG_ITEM(map_sriForSM_enc_req_invalid_miss), + }, + { + "MAP-SRI-FOR-SM Response (invalid, missing mandatory IEs)", + TEST_MSG_ITEM(map_sriForSM_enc_res_invalid_miss), + }, + { + /* FIXME: how it supposed to be detected??? decoding failure? */ + "MAP-SRI-FOR-SM Request (invalid, TV vs TLV mismatch)", + TEST_MSG_ITEM(map_sriForSM_enc_req_invalid_tv_vs_tlv), + }, +}; + +int main(int argc, char **argv) +{ + printf("Done.\n"); + return 0; +} diff --git a/tests/tlv/tlv_msg_def_test.ok b/tests/tlv/tlv_msg_def_test.ok new file mode 100644 index 0000000..619c561 --- /dev/null +++ b/tests/tlv/tlv_msg_def_test.ok @@ -0,0 +1 @@ +Done. -- To view, visit https://gerrit.osmocom.org/11105 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: Idef83b0c53b17503a64d7ab7422184ca4b60be57 Gerrit-Change-Number: 11105 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:46:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:46:47 +0000 Subject: Change in osmo-msc[master]: vty: add SCCP related vty commands Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11106 Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Change-Id: I245b153785f615b998bb5279cb8d93787d57b4b7 --- 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/06/11106/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index f87a95e..53d27d3 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -543,6 +543,7 @@ osmo_ss7_init(); osmo_ss7_vty_init_asp(tall_msc_ctx); + osmo_sccp_vty_init(); /* Parse options */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/11106 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: I245b153785f615b998bb5279cb8d93787d57b4b7 Gerrit-Change-Number: 11106 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:47:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:47:01 +0000 Subject: Change in osmo-sgsn[master]: vty: add SCCP related vty commands Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11107 Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Change-Id: Ie267aa014812b5c89f2268a65566d5427aa1ad7e --- M src/gprs/sgsn_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/11107/1 diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index feffefb..11ed5d3 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -400,6 +400,7 @@ #if BUILD_IU osmo_ss7_init(); osmo_ss7_vty_init_asp(tall_bsc_ctx); + osmo_sccp_vty_init(); #endif handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/11107 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: Ie267aa014812b5c89f2268a65566d5427aa1ad7e Gerrit-Change-Number: 11107 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:47:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:47:08 +0000 Subject: Change in osmo-iuh[master]: hnbgw: vty: add SCCP related vty commands Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11108 Change subject: hnbgw: vty: add SCCP related vty commands ...................................................................... hnbgw: vty: add SCCP related vty commands Change-Id: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/08/11108/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index 91e551b..cd6104b 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -524,6 +524,7 @@ vty_init(&vty_info); osmo_ss7_vty_init_asp(tall_hnb_ctx); + osmo_sccp_vty_init(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); logging_vty_add_cmds(&hnbgw_log_info); -- To view, visit https://gerrit.osmocom.org/11108 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: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 Gerrit-Change-Number: 11108 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:47:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:47:45 +0000 Subject: Change in osmo-bsc[master]: vty: add SCCP related vty commands Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11109 Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Change-Id: I2eb7f5cf9ffceeeb14882190d8545601795d3288 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/11109/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0dbe81c..60175e1 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -832,6 +832,7 @@ /* Initalize SS7 */ osmo_ss7_init(); osmo_ss7_vty_init_asp(tall_bsc_ctx); + osmo_sccp_vty_init(); /* parse options */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/11109 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: I2eb7f5cf9ffceeeb14882190d8545601795d3288 Gerrit-Change-Number: 11109 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:35 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: sccp_scoc.c: fix timers definition units Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11110 Change subject: cosmetic: sccp_scoc.c: fix timers definition units ...................................................................... cosmetic: sccp_scoc.c: fix timers definition units The SCCP timer units are not what the comments say: Milliseconds are 1000 * seconds, not 100. Also, microseconds are 1000000 * seconds. Interestingly enough, MSEC_TO_US() tried to fix the wrong hundredth-seconds to microseconds by multiplying by 10, however, it should end up at a factor of a million, not a thousand, hence would result in wrong sub-second fractions. But, since none of the current timers use sub-second fractions, none of the timers are actually affected in practice. Hence this patch is merely cosmetic. Since all use of the timer constants is wrapped in MSEC_TO_US(), we can transparently fix all those values and their use: - define the constants in milliseconds (replace "100" with "1000"). - in MSEC_TO_US(), divide-and-mod by 1000. - in MSEC_TO_US(), actually calculate microseconds. BTW, I am about to make the timers VTY configurable, but before I get confused, I'd rather fix these units first. Change-Id: Ia6c893f734fbdc88873c4ef80f6cacf01ee7763a --- M src/sccp_scoc.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/10/11110/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 3de986d..1057be0 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -65,18 +65,18 @@ #define SCU_MSGB_SIZE 1024 /* Appendix C.4 of Q.714 (all in milliseconds) */ -#define CONNECTION_TIMER ( 1 * 60 * 100) -#define TX_INACT_TIMER ( 7 * 60 * 100) /* RFC 3868 Ch. 8. */ -#define RX_INACT_TIMER (15 * 60 * 100) /* RFC 3868 Ch. 8. */ -#define RELEASE_TIMER ( 10 * 100) -#define RELEASE_REP_TIMER ( 10 * 100) -#define INT_TIMER ( 1 * 60 * 100) -#define GUARD_TIMER (23 * 60 * 100) -#define RESET_TIMER ( 10 * 100) +#define CONNECTION_TIMER ( 1 * 60 * 1000) +#define TX_INACT_TIMER ( 7 * 60 * 1000) /* RFC 3868 Ch. 8. */ +#define RX_INACT_TIMER (15 * 60 * 1000) /* RFC 3868 Ch. 8. */ +#define RELEASE_TIMER ( 10 * 1000) +#define RELEASE_REP_TIMER ( 10 * 1000) +#define INT_TIMER ( 1 * 60 * 1000) +#define GUARD_TIMER (23 * 60 * 1000) +#define RESET_TIMER ( 10 * 1000) /* convert from single value in milliseconds to comma-separated * "seconds, microseconds" format we use in osmocom/core/timers.h */ -#define MSEC_TO_S_US(x) (x/100), ((x%100)*10) +#define MSEC_TO_S_US(x) (x/1000), ((x%1000)*1000) /*********************************************************************** * SCCP connection table -- To view, visit https://gerrit.osmocom.org/11110 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: Ia6c893f734fbdc88873c4ef80f6cacf01ee7763a Gerrit-Change-Number: 11110 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:36 +0000 Subject: Change in libosmo-sccp[master]: drop inaccurate comment from osmo_ss7_vty.c Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11111 Change subject: drop inaccurate comment from osmo_ss7_vty.c ...................................................................... drop inaccurate comment from osmo_ss7_vty.c Change-Id: I845f6661eaed361b5d4db88140efb8eb79b6b69d --- M src/osmo_ss7_vty.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/11/11111/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index ea06b02..2f70bb6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -509,7 +509,6 @@ xs->cfg.local.port, VTY_NEWLINE); } -/* List all addressbook entries */ DEFUN(show_cs7_xua, show_cs7_xua_cmd, "show cs7 "XUA_VAR_STR" [<0-65534>]", SHOW_STR CS7_STR XUA_VAR_HELP_STR "Port Number") -- To view, visit https://gerrit.osmocom.org/11111 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: I845f6661eaed361b5d4db88140efb8eb79b6b69d Gerrit-Change-Number: 11111 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:36 +0000 Subject: Change in libosmo-sccp[master]: allow less characters for SCCP address book entries Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11112 Change subject: allow less characters for SCCP address book entries ...................................................................... allow less characters for SCCP address book entries Allowing a whole line of characters as address book name would be a lot, allowing 512 characters is completely ridiculous. That's more than this entire commit log message! 32 is plenty. Though libosmo-sigtran becomes binary-backwards-incompatible, all linking programs should automatically get the limitation in their VTY parsing without any changes. Change-Id: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a --- M src/osmo_ss7_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/12/11112/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 2f70bb6..c66a781 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1018,7 +1018,7 @@ struct llist_head list; struct llist_head list_global; struct osmo_ss7_instance *inst; - char name[512]; + char name[32]; struct osmo_sccp_addr addr; }; -- To view, visit https://gerrit.osmocom.org/11112 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: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a Gerrit-Change-Number: 11112 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:36 +0000 Subject: Change in libosmo-sccp[master]: vty: fix 'show asp' from within 'asp' node Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11113 Change subject: vty: fix 'show asp' from within 'asp' node ...................................................................... vty: fix 'show asp' from within 'asp' node When entering an 'cs7' / 'asp' node, and invoking 'do show cs7 i 0 asp', the ASP's FSM instance is not yet allocated. Hence attempting to print its status will result in a segfault. Spotted this while writing VTY tests that will follow shortly in another patch (I6a28684fa24d6e7de568623444297028eba2ab8c). Change-Id: I3ebf498492c6ba69a5dd1c9f36acdabfd6fbdfe1 --- M src/osmo_ss7_vty.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/13/11113/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index c66a781..295fc20 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -666,7 +666,8 @@ llist_for_each_entry(asp, &inst->asp_list, list) { vty_out(vty, "%-12s %-12s %-13s %-4s %-8u %-15s %-10s%s", - asp->cfg.name, "?", osmo_fsm_inst_state_name(asp->fi), + asp->cfg.name, "?", + asp->fi? osmo_fsm_inst_state_name(asp->fi) : "uninitialized", get_value_string(osmo_ss7_asp_protocol_vals, asp->cfg.proto), asp->cfg.remote.port, asp->cfg.remote.host, "", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/11113 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: I3ebf498492c6ba69a5dd1c9f36acdabfd6fbdfe1 Gerrit-Change-Number: 11113 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:36 +0000 Subject: Change in libosmo-sccp[master]: add tests/vty: VTY UI transcript testing Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11114 Change subject: add tests/vty: VTY UI transcript testing ...................................................................... add tests/vty: VTY UI transcript testing Add ss7_asp_vty_test, a shim test program with the sole purpose of exposing the cs7 VTY nodes. Add ss7_asp_test.vty, transcript for verifying VTY nodes using above program. Add --enable-external-tests to configure. Run jenkins.sh with --enable-external-tests. Change-Id: I6a28684fa24d6e7de568623444297028eba2ab8c --- M configure.ac M contrib/jenkins.sh M tests/Makefile.am A tests/vty/Makefile.am A tests/vty/ss7_asp_test.vty A tests/vty/ss7_asp_vty_test.c 6 files changed, 621 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/14/11114/1 diff --git a/configure.ac b/configure.ac index af64bc0..7dfb266 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,21 @@ [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AM_PATH_PYTHON + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + 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]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -133,6 +148,7 @@ tests/m2ua/Makefile tests/xua/Makefile tests/ss7/Makefile + tests/vty/Makefile examples/Makefile stp/Makefile doc/Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d15cebe..a417a9e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,9 +36,10 @@ set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror +./configure --enable-sanitize --enable-werror --enable-external-tests $MAKE $PARALLEL_MAKE -$MAKE distcheck \ +DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ + $MAKE distcheck \ || cat-testlogs.sh osmo-clean-workspace.sh diff --git a/tests/Makefile.am b/tests/Makefile.am index 70e8a00..34bba67 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = xua sccp mtp m2ua ss7 +SUBDIRS = xua sccp mtp m2ua ss7 vty # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am new file mode 100644 index 0000000..28e9dc2 --- /dev/null +++ b/tests/vty/Makefile.am @@ -0,0 +1,32 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) + +AM_LDFLAGS = -static +LDADD = $(top_builddir)/src/libosmo-sigtran.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +EXTRA_DIST = ss7_asp_test.vty + +noinst_PROGRAMS = ss7_asp_vty_test + +ss7_asp_vty_test_SOURCES = ss7_asp_vty_test.c + +if ENABLE_EXT_TESTS +ext-tests: + $(MAKE) vty-test +else +ext-tests: + echo "Not running python-based external tests (determined at configure-time)" +endif + +# To update the VTY script from current application behavior, +# pass -u to osmo_verify_transcript_vty.py by doing: +# make vty-test U=-u +vty-test: ss7_asp_vty_test + osmo_verify_transcript_vty.py -v \ + -p 42043 \ + -r "$(builddir)/ss7_asp_vty_test" \ + $(U) $(srcdir)/ss7_asp_*.vty + +check-local: + $(MAKE) $(AM_MAKEFLAGS) ext-tests diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty new file mode 100644 index 0000000..fc46cff --- /dev/null +++ b/tests/vty/ss7_asp_test.vty @@ -0,0 +1,350 @@ +ss7_asp_vty_test> list +... !show cs7 + show cs7 instance <0-15> users + show cs7 (sua|m3ua|ipa) [<0-65534>] + show cs7 instance <0-15> asp + show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp users + show cs7 instance <0-15> sccp ssn <0-65535> + show cs7 instance <0-15> sccp connections +... !show cs7 + +ss7_asp_vty_test> enable +ss7_asp_vty_test# list +... !show cs7 + show cs7 instance <0-15> users + show cs7 (sua|m3ua|ipa) [<0-65534>] + show cs7 instance <0-15> asp + show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp users + show cs7 instance <0-15> sccp ssn <0-65535> + show cs7 instance <0-15> sccp connections +... !show cs7 + +ss7_asp_vty_test# show ? +... + cs7 ITU-T Signaling System 7 +... + +ss7_asp_vty_test# show cs7 ? + instance An instance of the SS7 stack + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +ss7_asp_vty_test# show cs7 m3ua ? + [<0-65534>] Port Number + +ss7_asp_vty_test# show cs7 instance ? + <0-15> An instance of the SS7 stack + +ss7_asp_vty_test# show cs7 instance 0 ? + users User Table + asp Application Server Process (ASP) + as Application Server (AS) + sccp Signaling Connection Control Part + +ss7_asp_vty_test# show cs7 instance 0 as ? + active Display all active ASs + all Display all ASs (default) + m3ua Display all m3ua ASs + sua Display all SUA ASs + +ss7_asp_vty_test# show cs7 instance 0 sccp ? + users Show List of SCCP Users registered + ssn Show List of SCCP Users registered + connections Show List of SCCP Users registered + +ss7_asp_vty_test# show cs7 instance 0 sccp ssn ? + <0-65535> + +ss7_asp_vty_test# configure terminal +ss7_asp_vty_test(config)# cs7 instance 0 + +ss7_asp_vty_test(config-cs7)# list +... + description .TEXT + network-indicator (international | national | reserved | spare) + point-code POINT_CODE + point-code format <1-24> [<1-23>] [<1-22>] + point-code format default + point-code delimiter (default|dash) + xua rkm routing-key-allocation (static-only|dynamic-permitted) + asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) + no asp NAME + as NAME (sua|m3ua|ipa) + no as NAME + show cs7 instance <0-15> sccp-addressbook + sccp-address NAME + no sccp-address NAME + +ss7_asp_vty_test(config-cs7)# ? +... + description Save human-readable description of the object + network-indicator Configure the Network Indicator + point-code Configure the local Point Code + xua SIGTRAN xxxUA related + asp Configure Application Server Process + no Negate a command or set its defaults + as Configure an Application Server + sccp-address Create/Modify an SCCP addressbook entry + +ss7_asp_vty_test(config-cs7)# description ? + TEXT Text until the end of the line + +ss7_asp_vty_test(config-cs7)# network-indicator ? + international International Network + national National Network + reserved Reserved Network + spare Spare Network + +ss7_asp_vty_test(config-cs7)# point-code ? + POINT_CODE Point Code + format Configure Point Code Format + delimiter Configure Point Code Delimiter + +ss7_asp_vty_test(config-cs7)# point-code format ? + <1-24> Length of first PC component + default Default Point Code Format (3.8.3) +ss7_asp_vty_test(config-cs7)# point-code format 1 ? + [<1-23>] Length of second PC component +ss7_asp_vty_test(config-cs7)# point-code format 1 1 ? + [<1-22>] Length of third PC component + +ss7_asp_vty_test(config-cs7)# point-code delimiter ? + default Use dot as delimiter + dash User dash as delimiter + +ss7_asp_vty_test(config-cs7)# xua ? + rkm Routing Key Management +ss7_asp_vty_test(config-cs7)# xua rkm ? + routing-key-allocation Routing Key Management Allocation Policy +ss7_asp_vty_test(config-cs7)# xua rkm routing-key-allocation ? + static-only Only static (pre-confgured) Routing Keys permitted + dynamic-permitted Dynamically allocate Routing Keys for what ASPs request + +ss7_asp_vty_test(config-cs7)# asp ? + NAME Name of ASP +ss7_asp_vty_test(config-cs7)# asp foo ? + <0-65535> Remote SCTP port number +ss7_asp_vty_test(config-cs7)# asp foo 0 ? + <0-65535> Local SCTP port number +ss7_asp_vty_test(config-cs7)# asp foo 0 0 ? + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +ss7_asp_vty_test(config-cs7)# as ? + NAME Name of the Application Server +ss7_asp_vty_test(config-cs7)# as foo ? + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +ss7_asp_vty_test(config-cs7)# sccp-address ? + NAME Name of the SCCP Address + +ss7_asp_vty_test(config-cs7)# no ? + asp Disable Application Server Process + as Disable Application Server + sccp-address Delete an SCCP addressbook entry +ss7_asp_vty_test(config-cs7)# no asp ? + NAME Name of ASP +ss7_asp_vty_test(config-cs7)# no as ? + NAME Name of AS +ss7_asp_vty_test(config-cs7)# no sccp-address ? + NAME Name of the SCCP Address + +ss7_asp_vty_test(config-cs7)# sccp-address foo +ss7_asp_vty_test(config-cs7-sccpaddr)# list +... + no point-code + no subsystem-number + no global-title + routing-indicator (GT|PC|IP) + point-code POINT_CODE + subsystem-number <0-4294967295> + global-title +ss7_asp_vty_test(config-cs7-sccpaddr)# ? +... + no Negate a command or set its defaults + routing-indicator Add Routing Indicator + point-code Add point-code Number + subsystem-number Add Subsystem Number + global-title Add/Modify Global Title + +ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 + +ss7_asp_vty_test(config-cs7-sccpaddr)# do show cs7 instance 0 sccp addressbook +% Unknown command. +ss7_asp_vty_test(config-cs7-sccpaddr)# exit + +ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar +Error: SCCP address name to long: 'foobarfoobarfoobarfoobarfoobarfoobar' +% Command incomplete. + +ss7_asp_vty_test(config-cs7)# exit +ss7_asp_vty_test(config)# cs7 instance 1 +ss7_asp_vty_test(config-cs7)# sccp-address foo +Error: SCCP address name already used in ss7 instance 0: 'foo' +% Command incomplete. +ss7_asp_vty_test(config-cs7)# sccp-address bar +ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 +ss7_asp_vty_test(config-cs7-sccpaddr)# exit +ss7_asp_vty_test(config-cs7)# exit +ss7_asp_vty_test(config)# no cs7 instance 1 +% Unknown command. + +ss7_asp_vty_test(config)# cs7 instance 0 + +ss7_asp_vty_test(config-cs7)# asp my-asp 12345 54321 m3ua +ss7_asp_vty_test(config-cs7-asp)# list +... + description .TEXT + remote-ip A.B.C.D + local-ip A.B.C.D + qos-class <0-255> + block + shutdown + +ss7_asp_vty_test(config-cs7-asp)# ? +... + description Save human-readable description of the object + remote-ip Specify Remote IP Address of ASP + local-ip Specify Local IP Address from which to contact ASP + qos-class Specify QoS Class of ASP + block Allows a SCTP Association with ASP, but doesn't let it become active + shutdown Terminates SCTP association; New associations will be rejected + +ss7_asp_vty_test(config-cs7-asp)# remote-ip 127.0.0.200 +ss7_asp_vty_test(config-cs7-asp)# local-ip 127.0.0.100 +ss7_asp_vty_test(config-cs7-asp)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? uninitialized m3ua 12345 127.0.0.200 +ss7_asp_vty_test(config-cs7-asp)# exit + +ss7_asp_vty_test(config-cs7)# as my-ass m3ua +ss7_asp_vty_test(config-cs7-as)# list +... + description .TEXT + asp NAME + no asp NAME + traffic-mode (broadcast | loadshare | roundrobin | override) + recovery-timeout <1-2000> + qos-class <0-255> + routing-key RCONTEXT DPC + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) + routing-key RCONTEXT DPC ssn SSN + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN + point-code override dpc PC + +ss7_asp_vty_test(config-cs7-as)# ? +... + description Save human-readable description of the object + asp Specify that a given ASP is part of this AS + no Negate a command or set its defaults + traffic-mode Specifies traffic mode of operation of the ASP within the AS + recovery-timeout Specifies the recovery timeout value in milliseconds + qos-class Specity QoS Class of AS + routing-key Define a routing key + point-code Point Code Specific Features + +ss7_asp_vty_test(config-cs7-as)# no ? + asp Specify ASP to be removed from this AS + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 0.0.0 + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as active + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 0.0.0 + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as sua + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as m3ua + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 0.0.0 + +ss7_asp_vty_test(config-cs7-as)# asp my-asp +ss7_asp_vty_test(config-cs7-as)# routing-key 0 3.2.1 + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? ASP_DOWN m3ua 12345 127.0.0.200 + +ss7_asp_vty_test(config-cs7-as)# exit +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? ASP_DOWN m3ua 12345 127.0.0.200 + +ss7_asp_vty_test(config-cs7)# exit + + +ss7_asp_vty_test(config)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? ASP_DOWN m3ua 12345 127.0.0.200 + +ss7_asp_vty_test(config)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 3.2.1 + + + +ss7_asp_vty_test(config)# show running-config +... +cs7 instance 1 + sccp-address bar + routing-indicator PC + point-code 1.2.3 +cs7 instance 0 + asp my-asp 12345 54321 m3ua + local-ip 127.0.0.100 + remote-ip 127.0.0.200 + as my-ass m3ua + asp my-asp + routing-key 0 3.2.1 + sccp-address foo + routing-indicator PC + point-code 1.2.3 +end + +ss7_asp_vty_test(config)# do show cs7 instance 0 users + +ss7_asp_vty_test(config)# do show cs7 m3ua + +ss7_asp_vty_test(config)# cs7 instance 0 +ss7_asp_vty_test(config-cs7)# no asp unknown-asp +No ASP named 'unknown-asp' found + +ss7_asp_vty_test(config-cs7)# no asp my-asp + +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- + +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 3.2.1 diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c new file mode 100644 index 0000000..6918df4 --- /dev/null +++ b/tests/vty/ss7_asp_vty_test.c @@ -0,0 +1,219 @@ +/* test program with a vty interface to test VTY node behavior */ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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. + * + */ + +#define _GNU_SOURCE +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include + +void *root_ctx = NULL; + +const struct log_info log_info = { +}; + +static void print_help() +{ + printf( "options:\n" + " -h --help this text\n" + " -d --debug MASK Enable debugging (e.g. -d DRSL:DOML:DLAPDM)\n" + " -D --daemonize For the process into a background daemon\n" + " -c --config-file Specify the filename of the config file\n" + " -s --disable-color Don't use colors in stderr log output\n" + " -T --timestamp Prefix every log line with a timestamp\n" + " -V --version Print version information and exit\n" + " -e --log-level Set a global log-level\n" + ); +} + +static struct { + const char *config_file; + int daemonize; +} cmdline_config = {}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_idx = 0, c; + static const struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "debug", 1, 0, 'd' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "disable-color", 0, 0, 's' }, + { "timestamp", 0, 0, 'T' }, + { "version", 0, 0, 'V' }, + { "log-level", 1, 0, 'e' }, + {} + }; + + c = getopt_long(argc, argv, "hc:d:Dc:sTVe:", + long_options, &option_idx); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_config.daemonize = 1; + break; + case 'c': + cmdline_config.config_file = optarg; + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + } + } +} + +static int quit = 0; + +static void signal_handler(int signal) +{ + fprintf(stdout, "signal %u received\n", signal); + + switch (signal) { + case SIGINT: + case SIGTERM: + quit++; + break; + case SIGABRT: + osmo_generate_backtrace(); + /* in case of abort, we want to obtain a talloc report + * and then return to the caller, who will abort the process */ + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(root_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static struct vty_app_info vty_info = { + .name = "ss7_asp_vty_test", + .version = PACKAGE_VERSION, + .go_parent_cb = osmo_ss7_vty_go_parent, +}; + +int main(int argc, char **argv) +{ + int rc; + + root_ctx = talloc_named_const(NULL, 0, "ss7_asp_vty_test"); + + vty_info.tall_ctx = root_ctx; + vty_init(&vty_info); + + osmo_init_logging2(root_ctx, &log_info); + logging_vty_add_cmds(&log_info); + + osmo_ss7_init(); + osmo_ss7_vty_init_asp(root_ctx); + osmo_sccp_vty_init(); + + handle_options(argc, argv); + + osmo_talloc_vty_add_cmds(); + + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + + if (cmdline_config.config_file) { + rc = vty_read_config_file(cmdline_config.config_file, NULL); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + cmdline_config.config_file); + return 1; + } + } + + rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42043); + if (rc < 0) + return 2; + + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + + if (cmdline_config.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + return 6; + } + } + + while (!quit) { + log_reset_context(); + osmo_select_main(0); + } + + log_fini(); + + talloc_free(root_ctx); + talloc_free(tall_vty_ctx); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/11114 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: I6a28684fa24d6e7de568623444297028eba2ab8c Gerrit-Change-Number: 11114 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:37 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: define SCCP_STR once Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11115 Change subject: sccp_vty: define SCCP_STR once ...................................................................... sccp_vty: define SCCP_STR once Define SCCP_STR in sccp_internal.h, because I know that I want to also use it in osmo_ss7_vty.c. Fix "Signaling" to "Signalling" upon copying the old string. Change-Id: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 --- M src/sccp_internal.h M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 3 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/11115/1 diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 66d768d..651862f 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -5,6 +5,8 @@ #include #include +#define SCCP_STR "Signalling Connection Control Part\n" + /* an instance of the SCCP stack */ struct osmo_sccp_instance { /* entry in global list of ss7 instances */ diff --git a/src/sccp_vty.c b/src/sccp_vty.c index bcedbb6..2727ccc 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -54,8 +54,7 @@ DEFUN(show_sccp_users, show_sccp_users_cmd, "show cs7 instance <0-15> sccp users", - SHOW_STR CS7_STR INST_STR INST_STR - "Signaling Connection Control Part\n" + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR "Show List of SCCP Users registered\n") { int id = atoi(argv[0]); @@ -83,8 +82,7 @@ DEFUN(show_sccp_user_ssn, show_sccp_user_ssn_cmd, "show cs7 instance <0-15> sccp ssn <0-65535>", - SHOW_STR CS7_STR INST_STR INST_STR - "Signaling Connection Control Part\n" + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR "Show List of SCCP Users registered\n") { int id = atoi(argv[0]); @@ -118,8 +116,7 @@ DEFUN(show_sccp_connections, show_sccp_connections_cmd, "show cs7 instance <0-15> sccp connections", - SHOW_STR CS7_STR INST_STR INST_STR - "Signaling Connection Control Part\n" + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR "Show List of SCCP Users registered\n") { int id = atoi(argv[0]); diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index fc46cff..9a86b23 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -42,7 +42,7 @@ users User Table asp Application Server Process (ASP) as Application Server (AS) - sccp Signaling Connection Control Part + sccp Signalling Connection Control Part ss7_asp_vty_test# show cs7 instance 0 as ? active Display all active ASs -- To view, visit https://gerrit.osmocom.org/11115 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: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 Gerrit-Change-Number: 11115 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:37 +0000 Subject: Change in libosmo-sccp[master]: vty: tweak two printed strings Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11116 Change subject: vty: tweak two printed strings ...................................................................... vty: tweak two printed strings Fix typo "to long". Say 'cs7 instance' instead of 'ss7 instance': we are interacting with a user on the telnet VTY, and that user is configuring a 'cs7 instance'. Especially a lowercase 'ss7' is potentially confusing ("is there an 'ss7' node?"). Changes show in ss7_asp_test.vty. Change-Id: Iebb976531576268d58338895a4baadbca6137b80 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/16/11116/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 295fc20..1e2f437 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1289,7 +1289,7 @@ const char *name = argv[0]; if (strlen(name) >= sizeof(entry->name)) { - vty_out(vty, "Error: SCCP address name to long: '%s'%s", + vty_out(vty, "Error: SCCP address name too long: '%s'%s", name, VTY_NEWLINE); return CMD_ERR_INCOMPLETE; } @@ -1299,7 +1299,7 @@ entry = addr_entry_by_name_global(name); if (entry != NULL) { vty_out(vty, - "Error: SCCP address name already used in ss7 instance %u: '%s'%s", + "Error: SCCP address name already used in cs7 instance %u: '%s'%s", entry->inst->cfg.id, entry->name, VTY_NEWLINE); return CMD_ERR_INCOMPLETE; } diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 9a86b23..f96e0c0 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -180,13 +180,13 @@ ss7_asp_vty_test(config-cs7-sccpaddr)# exit ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar -Error: SCCP address name to long: 'foobarfoobarfoobarfoobarfoobarfoobar' +Error: SCCP address name too long: 'foobarfoobarfoobarfoobarfoobarfoobar' % Command incomplete. ss7_asp_vty_test(config-cs7)# exit ss7_asp_vty_test(config)# cs7 instance 1 ss7_asp_vty_test(config-cs7)# sccp-address foo -Error: SCCP address name already used in ss7 instance 0: 'foo' +Error: SCCP address name already used in cs7 instance 0: 'foo' % Command incomplete. ss7_asp_vty_test(config-cs7)# sccp-address bar ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 -- To view, visit https://gerrit.osmocom.org/11116 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: Iebb976531576268d58338895a4baadbca6137b80 Gerrit-Change-Number: 11116 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:38 +0000 Subject: Change in libosmo-sccp[master]: vty: install 'show cs7' for sccp addrs on _ve nodes Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11117 Change subject: vty: install 'show cs7' for sccp addrs on _ve nodes ...................................................................... vty: install 'show cs7' for sccp addrs on _ve nodes The 'show cs7 instance 0 sccp-addressbook' command should not be inside the 'cs7' node. That defies the point of naming the instance again, and it falls out of place of all the other 'show cs7' commands on the VIEW and ENABLE nodes. Drop the old command within the 'cs7' node without substitution or deprecation. At the same time, drop dash from 'show cs7 i 0 sccp-addressbook' There are various other show cs7 commands already defined in sccp_vty.c, which have 'sccp' as a separate string. Conform to that. Change-Id: I80e0bc0a91bcd3fb75372045db34592d2d663d41 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/17/11117/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 1e2f437..14539b6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -39,6 +39,7 @@ #include "xua_internal.h" #include +#include "sccp_internal.h" #define XUA_VAR_STR "(sua|m3ua|ipa)" @@ -1164,8 +1165,9 @@ /* List all addressbook entries */ DEFUN(cs7_show_sccpaddr, cs7_show_sccpaddr_cmd, - "show cs7 instance <0-15> sccp-addressbook", - SHOW_STR CS7_STR INST_STR INST_STR "List all SCCP addressbook entries\n") + "show cs7 instance <0-15> sccp addressbook", + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR + "List all SCCP addressbook entries\n") { struct osmo_ss7_instance *inst; struct osmo_sccp_addr_entry *entry; @@ -1727,7 +1729,7 @@ static void vty_init_addr(void) { install_node(&sccpaddr_node, NULL); - install_element(L_CS7_NODE, &cs7_show_sccpaddr_cmd); + install_element_ve(&cs7_show_sccpaddr_cmd); install_element(L_CS7_NODE, &cs7_sccpaddr_cmd); install_element(L_CS7_NODE, &cs7_sccpaddr_del_cmd); install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_pc_del_cmd); diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index f96e0c0..fee97b3 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -4,6 +4,7 @@ show cs7 (sua|m3ua|ipa) [<0-65534>] show cs7 instance <0-15> asp show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections @@ -16,6 +17,7 @@ show cs7 (sua|m3ua|ipa) [<0-65534>] show cs7 instance <0-15> asp show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections @@ -51,6 +53,7 @@ sua Display all SUA ASs ss7_asp_vty_test# show cs7 instance 0 sccp ? + addressbook List all SCCP addressbook entries users Show List of SCCP Users registered ssn Show List of SCCP Users registered connections Show List of SCCP Users registered @@ -74,7 +77,6 @@ no asp NAME as NAME (sua|m3ua|ipa) no as NAME - show cs7 instance <0-15> sccp-addressbook sccp-address NAME no sccp-address NAME @@ -176,7 +178,11 @@ ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 ss7_asp_vty_test(config-cs7-sccpaddr)# do show cs7 instance 0 sccp addressbook -% Unknown command. + +Name RI: PC: SSN: GT: +------------ --- --------- ---------- --------------------------------------- +foo PC 1.2.3 (none) (none) + ss7_asp_vty_test(config-cs7-sccpaddr)# exit ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar -- To view, visit https://gerrit.osmocom.org/11117 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: I80e0bc0a91bcd3fb75372045db34592d2d663d41 Gerrit-Change-Number: 11117 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:38 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: allocate ss7->sccp in one common function Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11118 Change subject: cosmetic: allocate ss7->sccp in one common function ...................................................................... cosmetic: allocate ss7->sccp in one common function Instead of allocating ss7->sccp in various places, unify that in one common function. We shouldn't spread the decision what to pass as priv pointer around everywhere. There is no functional difference. This is preparation for a patch where the sccp_instance gets allocated from the telnet VTY: I would prefer to hide all allocation details from that code; which also makes sense for the other callers of osmo_sccp_instance_create(). Change-Id: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c M src/sccp_user.c 3 files changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/11118/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index a93c663..34d5408 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -111,6 +111,8 @@ int osmo_ss7_instance_bind(struct osmo_ss7_instance *inst); int osmo_ss7_bind_all_instances(); +struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst); + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 025c21c..9805b3b 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -460,6 +460,18 @@ return rc; } +/*! Allocate an SCCP instance, if not present yet. + * \returns inst->sccp. */ +struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst) +{ + if (inst->sccp) + return inst->sccp; + + LOGSS7(inst, LOGL_NOTICE, "Creating SCCP instance\n"); + inst->sccp = osmo_sccp_instance_create(inst, NULL); + return inst->sccp; +} + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ @@ -1169,8 +1181,8 @@ llist_add_tail(&asp->list, &inst->asp_list); /* The SUA code internally needs SCCP to work */ - if (proto == OSMO_SS7_ASP_PROT_SUA && !inst->sccp) - inst->sccp = osmo_sccp_instance_create(inst, NULL); + if (proto == OSMO_SS7_ASP_PROT_SUA) + osmo_ss7_ensure_sccp(inst); } return asp; @@ -1817,8 +1829,8 @@ llist_add_tail(&oxs->list, &inst->xua_servers); /* The SUA code internally needs SCCP to work */ - if (proto == OSMO_SS7_ASP_PROT_SUA && !inst->sccp) - inst->sccp = osmo_sccp_instance_create(inst, NULL); + if (proto == OSMO_SS7_ASP_PROT_SUA) + osmo_ss7_ensure_sccp(inst); return oxs; } diff --git a/src/sccp_user.c b/src/sccp_user.c index 99ed96e..020166d 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -480,9 +480,7 @@ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name, asp->cfg.name); - /* Allocate SCCP instance */ - LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating SCCP instance\n", name); - ss7->sccp = osmo_sccp_instance_create(ss7, NULL); + osmo_ss7_ensure_sccp(ss7); if (!ss7->sccp) goto out_asp; @@ -562,7 +560,7 @@ goto out_xs; /* Allocate SCCP stack */ - ss7->sccp = osmo_sccp_instance_create(ss7, NULL); + osmo_ss7_ensure_sccp(ss7); if (!ss7->sccp) goto out_xs; -- To view, visit https://gerrit.osmocom.org/11118 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: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 Gerrit-Change-Number: 11118 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:38 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11119 Change subject: make SCCP timers configurable ...................................................................... make SCCP timers configurable The previous hardcoded SCCP timers may cause SCCP connection releases, if the peer is configured with far lower timers than libosmo-sccp. Testing with a specific SCCPlite MSC, I experienced an iar of just over three minutes, meaning that calls would be cut off by the MSC, since the osmo-bsc failed to send an Inactivity Timer message until seven minutes have passed. With this patch, SCCP timers are configurable by the user, with millisecond resolution (or by second or minute, for convenience). Define constant global default timers, and variable user-configurable timers with each osmo_sccp_instance. Add VTY UI to configure the timers. Users must call osmo_sccp_vty_init() to get the sccp-timer config nodes under the 'cs7' node. Show the new UI in ss7_asp_test.vty. Note that even though this function is not new at all, until recently, all of our SCCP users (osmo-bsc, osmo-msc, osmo-sgsn, osmo-hnbgw) failed to call osmo_sccp_vty_init(), and thus also missed out on the various 'show' commands defined in sccp_vty.c. In other words, to benefit from the timer configurability, the patches to call osmo_sccp_vty_init() must first be merged to the corresponding master branches. If a 'sccp-timer' config command occurs, the cs7 instance must allocate an SCCP instance in order to store the timer config. Do that by calling the recently added osmo_ss7_ensure_sccp() function. Hence remove the limitation that the SCCP instance must not be populated from the "simple" setup function. If we want to configure SCCP timers beforehand, there must be an SCCP instance for that, and there is no hard reason to require a NULL SCCP instance, besides the desire to prevent this function from being invoked twice. Change-Id: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_vty.c M src/sccp_internal.h M src/sccp_scoc.c M src/sccp_user.c M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 7 files changed, 385 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/19/11119/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 34d5408..3bf5d77 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -9,6 +9,8 @@ #include #include +#include + extern struct llist_head osmo_ss7_instances; struct osmo_ss7_instance; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 14539b6..7ef58cf 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -41,6 +41,8 @@ #include #include "sccp_internal.h" +#include "sccp_internal.h" + #define XUA_VAR_STR "(sua|m3ua|ipa)" #define XUA_VAR_HELP_STR \ @@ -1658,6 +1660,9 @@ /* Append SCCP Addressbook */ write_sccp_addressbook(vty, inst); + + if (inst->sccp) + osmo_sccp_vty_write_cs7_node(vty, " ", inst->sccp); } diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 651862f..000f0f7 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -7,6 +7,36 @@ #define SCCP_STR "Signalling Connection Control Part\n" +/* Appendix C.4 of Q.714 */ +enum osmo_sccp_timer { + OSMO_SCCP_TIMER_CONN_EST, + OSMO_SCCP_TIMER_IAS, + OSMO_SCCP_TIMER_IAR, + OSMO_SCCP_TIMER_REL, + OSMO_SCCP_TIMER_REPEAT_REL, + OSMO_SCCP_TIMER_INT, + OSMO_SCCP_TIMER_GUARD, + OSMO_SCCP_TIMER_RESET, + OSMO_SCCP_TIMER_REASSEMBLY, + /* This must remain the last item: */ + OSMO_SCCP_TIMERS_COUNT +}; + +struct osmo_sccp_timer_val { + uint32_t s; + uint32_t us; +}; + +extern const struct osmo_sccp_timer_val osmo_sccp_timer_defaults[]; + +extern const struct value_string osmo_sccp_timer_names[]; +static inline const char *osmo_sccp_timer_name(enum osmo_sccp_timer val) +{ return get_value_string(osmo_sccp_timer_names, val); } + +extern const struct value_string osmo_sccp_timer_descriptions[]; +static inline const char *osmo_sccp_timer_description(enum osmo_sccp_timer val) +{ return get_value_string(osmo_sccp_timer_descriptions, val); } + /* an instance of the SCCP stack */ struct osmo_sccp_instance { /* entry in global list of ss7 instances */ @@ -23,6 +53,8 @@ void *priv; struct osmo_ss7_user ss7_user; + + struct osmo_sccp_timer_val timers[OSMO_SCCP_TIMERS_COUNT]; }; struct osmo_sccp_user { @@ -90,3 +122,9 @@ struct osmo_fsm sccp_scoc_fsm; void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst); + +const struct osmo_sccp_timer_val *osmo_sccp_timer_get(const struct osmo_sccp_instance *inst, + enum osmo_sccp_timer timer, + bool default_if_unset); + +void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst); diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 1057be0..8138e43 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -64,20 +64,6 @@ #define S(x) (1 << (x)) #define SCU_MSGB_SIZE 1024 -/* Appendix C.4 of Q.714 (all in milliseconds) */ -#define CONNECTION_TIMER ( 1 * 60 * 1000) -#define TX_INACT_TIMER ( 7 * 60 * 1000) /* RFC 3868 Ch. 8. */ -#define RX_INACT_TIMER (15 * 60 * 1000) /* RFC 3868 Ch. 8. */ -#define RELEASE_TIMER ( 10 * 1000) -#define RELEASE_REP_TIMER ( 10 * 1000) -#define INT_TIMER ( 1 * 60 * 1000) -#define GUARD_TIMER (23 * 60 * 1000) -#define RESET_TIMER ( 10 * 1000) - -/* convert from single value in milliseconds to comma-separated - * "seconds, microseconds" format we use in osmocom/core/timers.h */ -#define MSEC_TO_S_US(x) (x/1000), ((x%1000)*1000) - /*********************************************************************** * SCCP connection table ***********************************************************************/ @@ -235,6 +221,109 @@ * Timer Handling ***********************************************************************/ +/* Appendix C.4 of ITU-T Q.714 */ +const struct value_string osmo_sccp_timer_names[] = { + { OSMO_SCCP_TIMER_CONN_EST, "conn_est" }, + { OSMO_SCCP_TIMER_IAS, "ias" }, + { OSMO_SCCP_TIMER_IAR, "iar" }, + { OSMO_SCCP_TIMER_REL, "rel" }, + { OSMO_SCCP_TIMER_REPEAT_REL, "repeat_rel" }, + { OSMO_SCCP_TIMER_INT, "int" }, + { OSMO_SCCP_TIMER_GUARD, "guard" }, + { OSMO_SCCP_TIMER_RESET, "reset" }, + { OSMO_SCCP_TIMER_REASSEMBLY, "reassembly" }, + {} +}; + +/* Mostly pasted from Appendix C.4 of ITU-T Q.714 (05/2001) -- some of their descriptions are quite + * unintelligible out of context, for which we have our own description here. */ +const struct value_string osmo_sccp_timer_descriptions[] = { + { OSMO_SCCP_TIMER_CONN_EST, + "Waiting for connection confirm message, 1 to 2 minutes" }, + { OSMO_SCCP_TIMER_IAS, + "Send keep-alive: on an idle connection, delay before sending an Idle Timer message," + " 5 to 10 minutes" }, + { OSMO_SCCP_TIMER_IAR, + "Receive keep-alive: on an idle connection, delay until considering a connection as stale," + " 11 to 21 minutes" }, + { OSMO_SCCP_TIMER_REL, + "Waiting for release complete message, 10 to 20 seconds" }, + { OSMO_SCCP_TIMER_REPEAT_REL, + "Waiting for release complete message; or to repeat sending released message after the initial" + " expiry, 10 to 20 seconds" }, + { OSMO_SCCP_TIMER_INT, + "Waiting for release complete message; or to release connection resources, freeze the LRN and" + " alert a maintenance function after the initial expiry, extending to 1 minute" }, + { OSMO_SCCP_TIMER_GUARD, + "Waiting to resume normal procedure for temporary connection sections during the restart" + " procedure, 23 to 25 minutes" }, + { OSMO_SCCP_TIMER_RESET, + "Waiting to release temporary connection section or alert maintenance function after reset" + " request message is sent, 10 to 20 seconds" }, + { OSMO_SCCP_TIMER_REASSEMBLY, + "Waiting to receive all the segments of the remaining segments, single segmented message after" + " receiving the first segment, 10 to 20 seconds" }, + {} +}; + +/* Appendix C.4 of ITU-T Q.714 */ +const struct osmo_sccp_timer_val osmo_sccp_timer_defaults[] = { + [OSMO_SCCP_TIMER_CONN_EST] = { .s = 1 * 60, }, + [OSMO_SCCP_TIMER_IAS] = { .s = 7 * 60, }, /* RFC 3868 Ch. 8. */ + [OSMO_SCCP_TIMER_IAR] = { .s = 15 * 60, }, /* RFC 3868 Ch. 8. */ + [OSMO_SCCP_TIMER_REL] = { .s = 10, }, + [OSMO_SCCP_TIMER_REPEAT_REL] = { .s = 10, }, + [OSMO_SCCP_TIMER_INT] = { .s = 1 * 60, }, + [OSMO_SCCP_TIMER_GUARD] = { .s = 23 * 60, }, + [OSMO_SCCP_TIMER_RESET] = { .s = 10, }, + [OSMO_SCCP_TIMER_REASSEMBLY] = { .s = 10, }, +}; + +osmo_static_assert(ARRAY_SIZE(osmo_sccp_timer_defaults) == OSMO_SCCP_TIMERS_COUNT, + assert_osmo_sccp_timers_count); + +/* Look up an SCCP timer value as configured in the osmo_ss7_instance. + * If no user defined value is set, return the global default from osmo_sccp_timer_defaults instead. + * However, if default_if_unset is passed false, return NULL in case there is no user defined setting, or + * in case it is identical to the global default. */ +const struct osmo_sccp_timer_val *osmo_sccp_timer_get(const struct osmo_sccp_instance *inst, + enum osmo_sccp_timer timer, + bool default_if_unset) +{ + const struct osmo_sccp_timer_val *val; + const struct osmo_sccp_timer_val *def; + + OSMO_ASSERT(timer >= 0 + && timer < ARRAY_SIZE(inst->timers) + && timer < ARRAY_SIZE(osmo_sccp_timer_defaults)); + + val = &inst->timers[timer]; + def = &osmo_sccp_timer_defaults[timer]; + + /* Assert that all timer definitions have a sane global default */ + OSMO_ASSERT(def->s || def->us); + + if (val->s || val->us) { + if (!default_if_unset && val->s == def->s && val->us == def->us) + return NULL; + return val; + } + + if (!default_if_unset) + return NULL; + + /* If unset, use the global default. */ + return def; +} + +static void sccp_timer_schedule(const struct sccp_connection *conn, + struct osmo_timer_list *timer, + enum osmo_sccp_timer timer_name) +{ + const struct osmo_sccp_timer_val *val = osmo_sccp_timer_get(conn->inst, timer_name, true); + osmo_timer_schedule(timer, val->s, val->us); +} + /* T(ias) has expired, send a COIT message to the peer */ static void tx_inact_tmr_cb(void *data) { @@ -280,13 +369,13 @@ /* Re-start the Tx inactivity timer */ static void conn_restart_tx_inact_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_ias, MSEC_TO_S_US(TX_INACT_TIMER)); + sccp_timer_schedule(conn, &conn->t_ias, OSMO_SCCP_TIMER_IAS); } /* Re-start the Rx inactivity timer */ static void conn_restart_rx_inact_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_iar, MSEC_TO_S_US(RX_INACT_TIMER)); + sccp_timer_schedule(conn, &conn->t_iar, OSMO_SCCP_TIMER_IAR); } /* Re-start both Rx and Tx inactivity timers */ @@ -306,19 +395,19 @@ /* Start release timer T(rel) */ static void conn_start_rel_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_rel, MSEC_TO_S_US(RELEASE_TIMER)); + sccp_timer_schedule(conn, &conn->t_rel, OSMO_SCCP_TIMER_REL); } /* Start repeat release timer T(rep_rel) */ static void conn_start_rep_rel_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_rep_rel, MSEC_TO_S_US(RELEASE_REP_TIMER)); + sccp_timer_schedule(conn, &conn->t_rep_rel, OSMO_SCCP_TIMER_REPEAT_REL); } /* Start interval timer T(int) */ static void conn_start_int_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_int, MSEC_TO_S_US(INT_TIMER)); + sccp_timer_schedule(conn, &conn->t_int, OSMO_SCCP_TIMER_INT); } /* Stop all release related timers: T(rel), T(int) and T(rep_rel) */ @@ -332,7 +421,7 @@ /* Start connect timer T(conn) */ static void conn_start_connect_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_conn, MSEC_TO_S_US(CONNECTION_TIMER)); + sccp_timer_schedule(conn, &conn->t_conn, OSMO_SCCP_TIMER_CONN_EST); } /* Stop connect timer T(conn) */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 020166d..793e08c 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -396,13 +396,6 @@ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using SS7 instance %u, pc:%s\n", name, ss7->cfg.id, osmo_ss7_pointcode_print(ss7, ss7->cfg.primary_pc)); - /* There must not be an existing SCCP istance, regarless if the simple - * client has created the SS7 instance or if it was already present. - * An already existing SCCP instance would be an indication that this - * function has been called twice with the same SS7 instance, which - * must not be the case! */ - OSMO_ASSERT(ss7->sccp == NULL); - /* Check if there is already an application server that matches * the protocol we intend to use. If not, we will create one. */ as = osmo_ss7_as_find_by_proto(ss7, prot); diff --git a/src/sccp_vty.c b/src/sccp_vty.c index 2727ccc..ffe2cf2 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -140,9 +140,146 @@ return CMD_SUCCESS; } +/* sccp-timer <1-999999> (m|s|ms) + * (cmdstr and doc are dynamically generated from osmo_sccp_timer_names.) */ +DEFUN(sccp_timer, sccp_timer_cmd, + NULL, NULL) +{ + struct osmo_ss7_instance *ss7 = vty->index; + enum osmo_sccp_timer timer = get_string_value(osmo_sccp_timer_names, argv[0]); + struct osmo_sccp_timer_val set_val = {}; + int val = atoi(argv[1]); + const char *unit = argv[2]; + + if (timer < 0 || timer >= OSMO_SCCP_TIMERS_COUNT) { + vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + if (!strcmp(unit, "m")) + set_val.s = val * 60; + else if (!strcmp(unit, "s")) + set_val.s = val; + else if (!strcmp(unit, "ms")) { + set_val.s = val / 1000; + set_val.us = (val % 1000) * 1000; + } + + osmo_ss7_ensure_sccp(ss7); + if (!ss7->sccp) { + vty_out(vty, "%% Error: cannot instantiate SCCP instance%s", VTY_NEWLINE); + return CMD_WARNING; + } + + ss7->sccp->timers[timer] = set_val; + return CMD_SUCCESS; +} + +static const char *osmo_sccp_timer_val_name(const struct osmo_sccp_timer_val *val) +{ + static char buf[16]; + + if (val->us) { + uint32_t ms = val->us / 1000 + val->s * 1000; + snprintf(buf, sizeof(buf), "%u ms", ms); + } else if (val->s % 60) + snprintf(buf, sizeof(buf), "%u s", val->s); + else + snprintf(buf, sizeof(buf), "%u m", val->s / 60); + return buf; +} + +static void gen_sccp_timer_cmd_strs() +{ + int i; + char *cmd_str = NULL; + char *doc_str = NULL; + + OSMO_ASSERT(sccp_timer_cmd.string == NULL); + OSMO_ASSERT(sccp_timer_cmd.doc == NULL); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "sccp-timer ("); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Configure SCCP timer values, see ITU-T Q.714\n"); + + for (i = 0; osmo_sccp_timer_names[i].str; i++) { + const struct osmo_sccp_timer_val *def; + enum osmo_sccp_timer timer; + + timer = osmo_sccp_timer_names[i].value; + def = &osmo_sccp_timer_defaults[timer]; + OSMO_ASSERT(timer >= 0 && timer < OSMO_SCCP_TIMERS_COUNT); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "%s%s", + i ? "|" : "", + osmo_sccp_timer_name(timer)); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %s)\n", + osmo_sccp_timer_description(timer), + osmo_sccp_timer_val_name(def)); + + + } + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, ") <1-999999> (m|s|ms)"); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, "Timer value\n" + "Timer value unit: minutes\n" + "Timer value unit: seconds\n" + "Timer value unit: milliseconds\n"); + + sccp_timer_cmd.string = cmd_str; + sccp_timer_cmd.doc = doc_str; +} + +static void write_sccp_timers(struct vty *vty, const char *indent, + struct osmo_sccp_instance *inst, bool default_if_unset) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(inst->timers); i++) { + const struct osmo_sccp_timer_val *val = osmo_sccp_timer_get(inst, i, default_if_unset); + if (!val) + continue; + vty_out(vty, "%ssccp-timer %s %s%s", indent, osmo_sccp_timer_name(i), + osmo_sccp_timer_val_name(val), VTY_NEWLINE); + } +} + +void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst) +{ + write_sccp_timers(vty, indent, inst, false); +} + +DEFUN(show_sccp_timers, show_sccp_timers_cmd, + "show cs7 instance <0-15> sccp timers", + SHOW_STR CS7_STR INST_STR INST_STR + "Signaling Connection Control Part\n" + "Show List of SCCP timers\n") +{ + int id = atoi(argv[0]); + struct osmo_ss7_instance *ss7; + + ss7 = osmo_ss7_instance_find(id); + if (!ss7) { + vty_out(vty, "No SS7 instance %d found%s", id, VTY_NEWLINE); + return CMD_WARNING; + } + + if (!ss7->sccp) { + vty_out(vty, "SS7 instance %d has no SCCP initialized%s", id, VTY_NEWLINE); + return CMD_SUCCESS; + } + + write_sccp_timers(vty, "", ss7->sccp, true); + return CMD_SUCCESS; +} + void osmo_sccp_vty_init(void) { install_element_ve(&show_sccp_users_cmd); install_element_ve(&show_sccp_user_ssn_cmd); install_element_ve(&show_sccp_connections_cmd); + + gen_sccp_timer_cmd_strs(); + install_element_ve(&show_sccp_timers_cmd); + install_element(L_CS7_NODE, &sccp_timer_cmd); } diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index fee97b3..a679c66 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -8,6 +8,7 @@ show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections + show cs7 instance <0-15> sccp timers ... !show cs7 ss7_asp_vty_test> enable @@ -21,6 +22,7 @@ show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections + show cs7 instance <0-15> sccp timers ... !show cs7 ss7_asp_vty_test# show ? @@ -57,6 +59,7 @@ users Show List of SCCP Users registered ssn Show List of SCCP Users registered connections Show List of SCCP Users registered + timers Show List of SCCP timers ss7_asp_vty_test# show cs7 instance 0 sccp ssn ? <0-65535> @@ -79,6 +82,7 @@ no as NAME sccp-address NAME no sccp-address NAME + sccp-timer (conn_est|ias|iar|rel|repeat_rel|int|guard|reset|reassembly) <1-999999> (m|s|ms) ss7_asp_vty_test(config-cs7)# ? ... @@ -90,6 +94,7 @@ no Negate a command or set its defaults as Configure an Application Server sccp-address Create/Modify an SCCP addressbook entry + sccp-timer Configure SCCP timer values, see ITU-T Q.714 ss7_asp_vty_test(config-cs7)# description ? TEXT Text until the end of the line @@ -354,3 +359,92 @@ AS Name State Context Dpc Si Opc Ssn Min Max ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- my-ass AS_DOWN 0 3.2.1 + + +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +SS7 instance 0 has no SCCP initialized + +ss7_asp_vty_test(config-cs7)# show running-config +... !sccp-timer + +ss7_asp_vty_test(config-cs7)# sccp-timer ias 5 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +sccp-timer conn_est 1 m +sccp-timer ias 5 ms +sccp-timer iar 15 m +sccp-timer rel 10 s +sccp-timer repeat_rel 10 s +sccp-timer int 1 m +sccp-timer guard 23 m +sccp-timer reset 10 s +sccp-timer reassembly 10 s +ss7_asp_vty_test(config-cs7)# show running-config +... !sccp-timer + sccp-timer ias 5 ms +... !sccp-timer + +ss7_asp_vty_test(config-cs7)# sccp-timer ias 7 m +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +sccp-timer conn_est 1 m +sccp-timer ias 7 m +sccp-timer iar 15 m +sccp-timer rel 10 s +sccp-timer repeat_rel 10 s +sccp-timer int 1 m +sccp-timer guard 23 m +sccp-timer reset 10 s +sccp-timer reassembly 10 s +ss7_asp_vty_test(config-cs7)# show running-config +... !sccp-timer + +ss7_asp_vty_test(config-cs7)# sccp-timer? + sccp-timer Configure SCCP timer values, see ITU-T Q.714 + +ss7_asp_vty_test(config-cs7)# sccp-timer ? + conn_est Waiting for connection confirm message, 1 to 2 minutes (default: 1 m) + ias Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes (default: 7 m) + iar Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes (default: 15 m) + rel Waiting for release complete message, 10 to 20 seconds (default: 10 s) + repeat_rel Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds (default: 10 s) + int Waiting for release complete message; or to release connection resources, freeze the LRN and alert a maintenance function after the initial expiry, extending to 1 minute (default: 1 m) + guard Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes (default: 23 m) + reset Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds (default: 10 s) + reassembly Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds (default: 10 s) + +ss7_asp_vty_test(config-cs7)# sccp-timer conn_est ? + <1-999999> Timer value + +ss7_asp_vty_test(config-cs7)# sccp-timer conn_est 1 ? + m Timer value unit: minutes + s Timer value unit: seconds + ms Timer value unit: milliseconds + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 1 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 1 ms +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 1000 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 1 s +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 60000 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 1 m +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 60500 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 60500 ms +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 65000 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 65 s +... -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 00:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 00:49:39 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11120 Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... build: move include/{mtp,sccp} to include/osmocom/ Anywhere else in the Osmocom code base, we arrange headers in include/osmocom/foo/ and pass -I ${root_srcdir}/include/. This way including an osmocom header always has the format #include whether we are including from the local source tree or from $prefix. For some reason not clear to me, the mtp and sccp folders, even though they are being installed to $prefix/include/osmocom/, were kept *next* to the osmocom/ dir, instead of inside it. Fix that weird situation. The motivation is that I wanted to use a definition from sccp_types.h in a public-API header. That is impossible if it requires #include in a local build, but #include for any other source tree using libosmo-sccp. After this patch, both are identical and including works without quirks. (The other patch that needed this has changed in the meantime on and no longer needs this, but this still makes sense for future hacking.) The installed result does not change, since both mtp/*.h and sccp/*.h have always been installed to $prefix/include/osmocom/{mtp,sccp}/. This merely changes their position in the source tree. The most curious situation before this is that any patch #including might not get a notice that the header didn't exist, but might instead include an older system-installed file. Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 --- M configure.ac M include/Makefile.am M include/osmocom/Makefile.am R include/osmocom/mtp/Makefile.am R include/osmocom/mtp/mtp_level3.h R include/osmocom/mtp/mtp_pcap.h R include/osmocom/sccp/Makefile.am R include/osmocom/sccp/sccp.h R include/osmocom/sccp/sccp_types.h M src/mtp_pcap.c M src/sccp.c M src/sccp2sua.c M src/sccp_sclc.c M src/sccp_scoc.c M src/sccp_scrc.c M tests/mtp/mtp_parse_test.c M tests/sccp/sccp_test.c 17 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/20/11120/1 diff --git a/configure.ac b/configure.ac index 7dfb266..acef6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -136,9 +136,9 @@ libosmo-sccp.pc libosmo-mtp.pc libosmo-xua.pc - include/sccp/Makefile - include/mtp/Makefile include/osmocom/Makefile + include/osmocom/sccp/Makefile + include/osmocom/mtp/Makefile include/osmocom/sigtran/Makefile include/Makefile src/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 7cd4b57..3578a80 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1 @@ -SUBDIRS = sccp mtp osmocom +SUBDIRS = osmocom diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index 7e86a4b..c4535f3 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1 +1 @@ -SUBDIRS = sigtran +SUBDIRS = mtp sccp sigtran diff --git a/include/mtp/Makefile.am b/include/osmocom/mtp/Makefile.am similarity index 100% rename from include/mtp/Makefile.am rename to include/osmocom/mtp/Makefile.am diff --git a/include/mtp/mtp_level3.h b/include/osmocom/mtp/mtp_level3.h similarity index 100% rename from include/mtp/mtp_level3.h rename to include/osmocom/mtp/mtp_level3.h diff --git a/include/mtp/mtp_pcap.h b/include/osmocom/mtp/mtp_pcap.h similarity index 100% rename from include/mtp/mtp_pcap.h rename to include/osmocom/mtp/mtp_pcap.h diff --git a/include/sccp/Makefile.am b/include/osmocom/sccp/Makefile.am similarity index 100% rename from include/sccp/Makefile.am rename to include/osmocom/sccp/Makefile.am diff --git a/include/sccp/sccp.h b/include/osmocom/sccp/sccp.h similarity index 100% rename from include/sccp/sccp.h rename to include/osmocom/sccp/sccp.h diff --git a/include/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h similarity index 100% rename from include/sccp/sccp_types.h rename to include/osmocom/sccp/sccp_types.h diff --git a/src/mtp_pcap.c b/src/mtp_pcap.c index e83e6f7..a59efc5 100644 --- a/src/mtp_pcap.c +++ b/src/mtp_pcap.c @@ -22,7 +22,7 @@ * */ -#include +#include #include diff --git a/src/sccp.c b/src/sccp.c index a15a84b..8c3641c 100644 --- a/src/sccp.c +++ b/src/sccp.c @@ -31,7 +31,7 @@ #include #include -#include +#include // Unassigned debug area static int DSCCP = 0; diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 2f5b687..f68f9a9 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index e4dbae6..db67660 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include "xua_internal.h" #include "sccp_internal.h" diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 8138e43..fbbad49 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include "xua_internal.h" #include "sccp_internal.h" diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 9005dc7..db49299 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/mtp/mtp_parse_test.c b/tests/mtp/mtp_parse_test.c index 75650a3..92c34ca 100644 --- a/tests/mtp/mtp_parse_test.c +++ b/tests/mtp/mtp_parse_test.c @@ -1,5 +1,5 @@ /* MTP Layer3 parsing tests */ -#include +#include #include diff --git a/tests/sccp/sccp_test.c b/tests/sccp/sccp_test.c index ed485bc..ba9ff7a 100644 --- a/tests/sccp/sccp_test.c +++ b/tests/sccp/sccp_test.c @@ -31,7 +31,7 @@ #include #include -#include +#include #define MIN(x, y) ((x) < (y) ? (x) : (y)) -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:31:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:31:29 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: fix doc strings for show ... ssn, connections Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11121 Change subject: sccp_vty: fix doc strings for show ... ssn,connections ...................................................................... sccp_vty: fix doc strings for show ... ssn,connections For 'show cs7 instance 0 ssn', fix doc string for 'ssn', and add missing one for the SSN arg. This fixes depending builds that see VTY test failures due to the missing doc string. For 'show cs7 instance 0 connectsion', fix doc string for 'connections'. Change-Id: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e --- M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/21/11121/1 diff --git a/src/sccp_vty.c b/src/sccp_vty.c index ffe2cf2..c2e5505 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -83,7 +83,8 @@ DEFUN(show_sccp_user_ssn, show_sccp_user_ssn_cmd, "show cs7 instance <0-15> sccp ssn <0-65535>", SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR - "Show List of SCCP Users registered\n") + "Find an SCCP User registered for the given SSN\n" + "Subsystem Number (SSN)\n") { int id = atoi(argv[0]); int ssn = atoi(argv[1]); @@ -117,7 +118,7 @@ DEFUN(show_sccp_connections, show_sccp_connections_cmd, "show cs7 instance <0-15> sccp connections", SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR - "Show List of SCCP Users registered\n") + "Show List of active SCCP connections\n") { int id = atoi(argv[0]); struct osmo_ss7_instance *inst; diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index a679c66..fef4c49 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -57,12 +57,12 @@ ss7_asp_vty_test# show cs7 instance 0 sccp ? addressbook List all SCCP addressbook entries users Show List of SCCP Users registered - ssn Show List of SCCP Users registered - connections Show List of SCCP Users registered + ssn Find an SCCP User registered for the given SSN + connections Show List of active SCCP connections timers Show List of SCCP timers ss7_asp_vty_test# show cs7 instance 0 sccp ssn ? - <0-65535> + <0-65535> Subsystem Number (SSN) ss7_asp_vty_test# configure terminal ss7_asp_vty_test(config)# cs7 instance 0 -- To view, visit https://gerrit.osmocom.org/11121 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: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e Gerrit-Change-Number: 11121 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:53 +0000 Subject: Change in osmo-bsc[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11109 to look at the new patch set (#2). Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: I2eb7f5cf9ffceeeb14882190d8545601795d3288 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/11109/2 -- To view, visit https://gerrit.osmocom.org/11109 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: I2eb7f5cf9ffceeeb14882190d8545601795d3288 Gerrit-Change-Number: 11109 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 Thu Sep 27 01:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:54 +0000 Subject: Change in osmo-bsc[master]: make: allow vty-tests without configure Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11122 Change subject: make: allow vty-tests without configure ...................................................................... make: allow vty-tests without configure Change-Id: I8cb165890ed77bea8ae82f5228828fa19ff7e0b9 --- M tests/Makefile.am 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/11122/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 9b4cfe4..446276b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -49,6 +49,10 @@ $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count +else +python-tests: $(BUILT_SOURCES) + echo "Not running python-based tests (determined at configure-time)" +endif # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: @@ -58,10 +62,6 @@ -n OsmoBSC -p 4242 \ -r "$(top_builddir)/src/osmo-bsc/osmo-bsc -c $(top_srcdir)/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg" \ $(U) $(srcdir)/*.vty -else -python-tests: $(BUILT_SOURCES) - echo "Not running python-based tests (determined at configure-time)" -endif check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) -- To view, visit https://gerrit.osmocom.org/11122 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: I8cb165890ed77bea8ae82f5228828fa19ff7e0b9 Gerrit-Change-Number: 11122 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:54 +0000 Subject: Change in osmo-bsc[master]: test neighbor ident vty docs Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11123 Change subject: test neighbor ident vty docs ...................................................................... test neighbor ident vty docs Change-Id: I83a2b03c6a081c4ed3225d79d342913a261d9c1c --- M tests/neighbor_ident.vty 1 file changed, 89 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/11123/1 diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index bbdb461..dadbe13 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -90,6 +90,95 @@ neighbor del arfcn <0-1023> bsic (<0-63>|any) ... +OsmoBSC(config-net-bts)# neighbor? + neighbor Neighbor cell list + +OsmoBSC(config-net-bts)# neighbor ? + add Add local or remote-BSS neighbor cell + del Remove local or remote-BSS neighbor cell + +OsmoBSC(config-net-bts)# neighbor add ? + bts Neighbor cell by local BTS number + lac Neighbor cell by LAC + lac-ci Neighbor cell by LAC and CI + cgi Neighbor cell by cgi + +OsmoBSC(config-net-bts)# neighbor add bts ? + <0-255> BTS number +OsmoBSC(config-net-bts)# neighbor add bts 0 ? + + +OsmoBSC(config-net-bts)# neighbor add lac ? + <0-65535> LAC +OsmoBSC(config-net-bts)# neighbor add lac 0 ? + arfcn ARFCN of neighbor cell + +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic 0 ? + + +OsmoBSC(config-net-bts)# neighbor add lac-ci ? + <0-65535> LAC +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 ? + <0-65535> CI +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 ? + arfcn ARFCN of neighbor cell + +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic 0 ? + + +OsmoBSC(config-net-bts)# neighbor add cgi ? + <0-999> MCC +OsmoBSC(config-net-bts)# neighbor add cgi 0 ? + <0-999> MNC +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 ? + <0-65535> LAC +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 ? + <0-65535> CI +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 ? + arfcn ARFCN of neighbor cell +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic 0 ? + + +OsmoBSC(config-net-bts)# neighbor del ? + bts Neighbor cell by local BTS number + arfcn ARFCN of neighbor cell + +OsmoBSC(config-net-bts)# neighbor del bts ? + <0-255> BTS number +OsmoBSC(config-net-bts)# neighbor del bts 0 ? + + +OsmoBSC(config-net-bts)# neighbor del arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor del arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic 0 ? + + OsmoBSC(config-net-bts)# show running-config ... !neighbor add -- To view, visit https://gerrit.osmocom.org/11123 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: I83a2b03c6a081c4ed3225d79d342913a261d9c1c Gerrit-Change-Number: 11123 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:54 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: drop keyword 'add' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11124 Change subject: neighbor vty: drop keyword 'add' ...................................................................... neighbor vty: drop keyword 'add' When writing the neighbor configuration documentation, I noticed that 'neighbor add' and 'neighbor del' make sense from an interactive VTY POV, but when looking at a static config file, it makes more sense to simply name the neighbors without the 'add' keyword, and to use the 'no' prefix instead of the 'del' keyword. It still makes sense to tweak cosmetics like this before inter-bsc handover is used anywhere. First, remove 'add' from all 'neighbor add ...' commands. Instead, prepend "Add" to the doc string for the cell identification argument in commands that add a neighbor: -OsmoBSC(config-net-bts)# neighbor add ? - bts Neighbor cell by local BTS number +OsmoBSC(config-net-bts)# neighbor ? + bts Add Neighbor cell by local BTS number (A subsequent patch will rename 'neighbor del' to 'no neighbor'.) Change-Id: I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 111 insertions(+), 113 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/11124/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 28f4afd..8db9db7 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -68,10 +68,10 @@ return true; } -#define NEIGHBOR_ADD_CMD "neighbor add " +#define NEIGHBOR_ADD_CMD "neighbor " #define NEIGHBOR_DEL_CMD "neighbor del " -#define NEIGHBOR_DOC "Neighbor cell list\n" -#define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n" +#define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n" +#define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add " #define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" #define LAC_PARAMS "lac <0-65535>" @@ -431,7 +431,7 @@ return true; #define NEIGH_BSS_WRITE(fmt, args...) do { \ - vty_out(vty, "%sneighbor add " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \ + vty_out(vty, "%sneighbor " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \ if (key->bsic == BSIC_ANY) \ vty_out(vty, "bsic any"); \ else \ @@ -485,7 +485,7 @@ struct gsm_bts_ref *neigh; llist_for_each_entry(neigh, &bts->local_neighbors, entry) { - vty_out(vty, "%sneighbor add lac-ci %u %u%s", + vty_out(vty, "%sneighbor lac-ci %u %u%s", indent, neigh->bts->location_area_code, neigh->bts->cell_identity, VTY_NEWLINE); } diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index dadbe13..644e330 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -80,84 +80,81 @@ OsmoBSC(config-net)# bts 0 OsmoBSC(config-net-bts)# list ... - neighbor add bts <0-255> - neighbor add lac <0-65535> - 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-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 bts <0-255> + neighbor lac <0-65535> + neighbor lac-ci <0-65535> <0-65535> + neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) + neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) + neighbor 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) ... OsmoBSC(config-net-bts)# neighbor? - neighbor Neighbor cell list + neighbor Manage local and remote-BSS neighbor cells OsmoBSC(config-net-bts)# neighbor ? - add Add local or remote-BSS neighbor cell - del Remove local or remote-BSS neighbor cell + bts Add Neighbor cell by local BTS number + lac Add Neighbor cell by LAC + lac-ci Add Neighbor cell by LAC and CI + cgi Add Neighbor cell by cgi + del Remove local or remote-BSS neighbor cell -OsmoBSC(config-net-bts)# neighbor add ? - bts Neighbor cell by local BTS number - lac Neighbor cell by LAC - lac-ci Neighbor cell by LAC and CI - cgi Neighbor cell by cgi - -OsmoBSC(config-net-bts)# neighbor add bts ? +OsmoBSC(config-net-bts)# neighbor bts ? <0-255> BTS number -OsmoBSC(config-net-bts)# neighbor add bts 0 ? +OsmoBSC(config-net-bts)# neighbor bts 0 ? -OsmoBSC(config-net-bts)# neighbor add lac ? +OsmoBSC(config-net-bts)# neighbor lac ? <0-65535> LAC -OsmoBSC(config-net-bts)# neighbor add lac 0 ? +OsmoBSC(config-net-bts)# neighbor lac 0 ? arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn 0 bsic 0 ? -OsmoBSC(config-net-bts)# neighbor add lac-ci ? +OsmoBSC(config-net-bts)# neighbor lac-ci ? <0-65535> LAC -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 ? <0-65535> CI -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 ? arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn 0 bsic 0 ? -OsmoBSC(config-net-bts)# neighbor add cgi ? +OsmoBSC(config-net-bts)# neighbor cgi ? <0-999> MCC -OsmoBSC(config-net-bts)# neighbor add cgi 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 ? <0-999> MNC -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 ? <0-65535> LAC -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 ? <0-65535> CI -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 ? arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ? OsmoBSC(config-net-bts)# neighbor del ? @@ -180,72 +177,73 @@ OsmoBSC(config-net-bts)# show running-config -... !neighbor add +... !neighbor -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 64 +OsmoBSC(config-net-bts)# ! BSIC out of range +OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 64 % Unknown command. -OsmoBSC(config-net-bts)# neighbor add bts 0 +OsmoBSC(config-net-bts)# neighbor bts 0 % Error: cannot add local BTS 0 as neighbor to BTS 0: Invalid argument OsmoBSC(config-net-bts)# show running-config -... !neighbor add +... !neighbor -OsmoBSC(config-net-bts)# neighbor add bts 1 +OsmoBSC(config-net-bts)# neighbor bts 1 % BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 -OsmoBSC(config-net-bts)# neighbor add lac 22 +OsmoBSC(config-net-bts)# neighbor lac 22 % 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 +OsmoBSC(config-net-bts)# neighbor 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 OsmoBSC(config-net-bts)# ### adding the same entry again results in no change -OsmoBSC(config-net-bts)# neighbor add bts 1 +OsmoBSC(config-net-bts)# neighbor bts 1 % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 -OsmoBSC(config-net-bts)# neighbor add lac-ci 21 31 +OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor 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 -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor 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 -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor 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 -OsmoBSC(config-net-bts)# neighbor add cgi 23 042 423 6 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor cgi 23 042 423 6 arfcn 23 bsic 42 % BTS 0 to ARFCN 23 BSIC 42 now has 2 remote BSS Cell Identifier List entries -OsmoBSC(config-net-bts)# neighbor add lac 456 arfcn 123 bsic 45 +OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45 % BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry -OsmoBSC(config-net-bts)# neighbor add cgi 23 042 234 56 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor cgi 23 042 234 56 arfcn 23 bsic 42 % BTS 0 to ARFCN 23 BSIC 42 now has 3 remote BSS Cell Identifier List entries -OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic any +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any % BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry -OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic 63 +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 63 % BTS 0 to ARFCN 423 BSIC 63 now has 1 remote BSS Cell Identifier List entry -OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic 1 +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 1 % BTS 0 to ARFCN 423 BSIC 1 now has 1 remote BSS Cell Identifier List entry OsmoBSC(config-net-bts)# show running-config ... network -... !neighbor add +... !neighbor bts 0 -... !neighbor add - neighbor add lac-ci 21 31 - 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 - 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 - neighbor add lac-ci 789 10 arfcn 423 bsic 1 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor cgi 023 42 423 5 arfcn 23 bsic 42 + neighbor cgi 023 042 423 6 arfcn 23 bsic 42 + neighbor cgi 023 042 234 56 arfcn 23 bsic 42 + neighbor lac 456 arfcn 123 bsic 45 + neighbor lac-ci 789 10 arfcn 423 bsic any + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 99 bsic any % No entry for BTS 0 to ARFCN 99 (any BSIC) @@ -254,10 +252,10 @@ % BTS 0 to ARFCN 41 (any BSIC) resolves to local BTS 1 lac-ci 21 31 OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 1 -% neighbor add lac-ci 789 10 arfcn 423 bsic 1 +% neighbor lac-ci 789 10 arfcn 423 bsic 1 OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23 -% neighbor add lac-ci 789 10 arfcn 423 bsic 23 +% neighbor lac-ci 789 10 arfcn 423 bsic 23 OsmoBSC(config-net-bts)# neighbor del arfcn 99 bsic 7 % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7 @@ -266,75 +264,75 @@ % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - 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 - neighbor add lac-ci 789 10 arfcn 423 bsic 1 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac 456 arfcn 123 bsic 45 + neighbor lac-ci 789 10 arfcn 423 bsic any + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 123 bsic 45 % Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - 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 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac-ci 789 10 arfcn 423 bsic any + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic any % Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC) OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - 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 +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - neighbor add lac-ci 22 65535 - neighbor add lac-ci 789 10 arfcn 423 bsic 1 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 1 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - neighbor add lac-ci 22 65535 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any % Removed local neighbor bts 0 to bts 1 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 22 65535 -... !neighbor add +... !neighbor + neighbor lac-ci 22 65535 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any % Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC) OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 22 65535 -... !neighbor add +... !neighbor + neighbor lac-ci 22 65535 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 % Removed local neighbor bts 0 to bts 2 OsmoBSC(config-net-bts)# show running-config -... !neighbor add +... !neighbor -- To view, visit https://gerrit.osmocom.org/11124 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: I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8 Gerrit-Change-Number: 11124 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:55 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: rather 'no neighbor', not 'neighbor del' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11125 Change subject: neighbor vty: rather 'no neighbor', not 'neighbor del' ...................................................................... neighbor vty: rather 'no neighbor', not 'neighbor del' Now the scheme nicely matches: bts 0 neighbor bts 1 no neighbor bts 1 Change-Id: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 23 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/11125/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 8db9db7..70240ac 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -69,10 +69,10 @@ } #define NEIGHBOR_ADD_CMD "neighbor " -#define NEIGHBOR_DEL_CMD "neighbor del " +#define NEIGHBOR_DEL_CMD "no neighbor " #define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n" #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add " -#define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" +#define NEIGHBOR_DEL_DOC NO_STR "Remove local or remote-BSS neighbor cell\n" #define LAC_PARAMS "lac <0-65535>" #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 644e330..8de34d6 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -86,8 +86,8 @@ neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor 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) + no neighbor bts <0-255> + no neighbor arfcn <0-1023> bsic (<0-63>|any) ... OsmoBSC(config-net-bts)# neighbor? @@ -98,7 +98,6 @@ lac Add Neighbor cell by LAC lac-ci Add Neighbor cell by LAC and CI cgi Add Neighbor cell by cgi - del Remove local or remote-BSS neighbor cell OsmoBSC(config-net-bts)# neighbor bts ? <0-255> BTS number @@ -157,23 +156,26 @@ OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ? -OsmoBSC(config-net-bts)# neighbor del ? +OsmoBSC(config-net-bts)# no neighbor? + neighbor Remove local or remote-BSS neighbor cell + +OsmoBSC(config-net-bts)# no neighbor ? bts Neighbor cell by local BTS number arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor del bts ? +OsmoBSC(config-net-bts)# no neighbor bts ? <0-255> BTS number -OsmoBSC(config-net-bts)# neighbor del bts 0 ? +OsmoBSC(config-net-bts)# no neighbor bts 0 ? -OsmoBSC(config-net-bts)# neighbor del arfcn ? +OsmoBSC(config-net-bts)# no neighbor arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor del arfcn 0 ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic 0 ? OsmoBSC(config-net-bts)# show running-config @@ -257,10 +259,10 @@ OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23 % neighbor lac-ci 789 10 arfcn 423 bsic 23 -OsmoBSC(config-net-bts)# neighbor del arfcn 99 bsic 7 +OsmoBSC(config-net-bts)# no neighbor arfcn 99 bsic 7 % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7 -OsmoBSC(config-net-bts)# neighbor del arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# no neighbor arfcn 23 bsic 42 % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config @@ -273,7 +275,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 123 bsic 45 +OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45 % Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45 OsmoBSC(config-net-bts)# show running-config @@ -285,7 +287,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any % Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC) OsmoBSC(config-net-bts)# show running-config @@ -296,7 +298,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63 +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config @@ -306,7 +308,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 1 +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config @@ -315,7 +317,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any % Removed local neighbor bts 0 to bts 1 OsmoBSC(config-net-bts)# show running-config @@ -323,7 +325,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any % Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC) OsmoBSC(config-net-bts)# show running-config @@ -331,7 +333,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 +OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12 % Removed local neighbor bts 0 to bts 2 OsmoBSC(config-net-bts)# show running-config -- To view, visit https://gerrit.osmocom.org/11125 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: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 Gerrit-Change-Number: 11125 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:55 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: allow setting local neighbors by CGI Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11126 Change subject: neighbor vty: allow setting local neighbors by CGI ...................................................................... neighbor vty: allow setting local neighbors by CGI Add missing item in the landscape of VTY commands: allow identifying a local cell by CGI (besides BTS nr, LAC or LAC+CI, which already exist). Change-Id: I2d03de6b695904c4a86025bf250358d04f6e47de --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/11126/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 70240ac..d0c23a8 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -80,6 +80,9 @@ #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 CGI_PARAMS "cgi <0-999> <0-999> <0-65535> <0-65535>" +#define CGI_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\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" @@ -235,6 +238,13 @@ return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv))); } +DEFUN(cfg_neighbor_add_cgi, cfg_neighbor_add_cgi_cmd, + NEIGHBOR_ADD_CMD CGI_PARAMS, + NEIGHBOR_ADD_DOC CGI_DOC) +{ + return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_cgi(vty, argv))); +} + bool neighbor_ident_key_matches_bts(const struct neighbor_ident_key *key, struct gsm_bts *bts) { if (!bts || !key) @@ -379,8 +389,8 @@ } 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-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) + NEIGHBOR_ADD_CMD CGI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_DOC CGI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_cgi(vty, argv); @@ -552,6 +562,7 @@ install_element(BTS_NODE, &cfg_neighbor_add_bts_nr_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_ci_cmd); + install_element(BTS_NODE, &cfg_neighbor_add_cgi_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_arfcn_bsic_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_ci_arfcn_bsic_cmd); install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd); diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 8de34d6..02b0f50 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -83,6 +83,7 @@ neighbor bts <0-255> neighbor lac <0-65535> neighbor lac-ci <0-65535> <0-65535> + neighbor cgi <0-999> <0-999> <0-65535> <0-65535> neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) @@ -146,6 +147,7 @@ <0-65535> CI OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 ? arfcn ARFCN of neighbor cell + OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn ? <0-1023> ARFCN value OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 ? @@ -196,6 +198,9 @@ OsmoBSC(config-net-bts)# neighbor lac 22 % BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 +OsmoBSC(config-net-bts)# no neighbor bts 2 +OsmoBSC(config-net-bts)# neighbor cgi 901 70 22 65535 +% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 OsmoBSC(config-net-bts)# neighbor 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 -- To view, visit https://gerrit.osmocom.org/11126 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: I2d03de6b695904c4a86025bf250358d04f6e47de Gerrit-Change-Number: 11126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:55 +0000 Subject: Change in osmo-bsc[master]: vty: write local neighbors by bts nr, not lac-ci Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11127 Change subject: vty: write local neighbors by bts nr, not lac-ci ...................................................................... vty: write local neighbors by bts nr, not lac-ci Change-Id: I35783f9624eacbdffccdb59a0179ffda54a26990 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 15 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/11127/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index d0c23a8..409153b 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -495,9 +495,7 @@ struct gsm_bts_ref *neigh; llist_for_each_entry(neigh, &bts->local_neighbors, entry) { - vty_out(vty, "%sneighbor lac-ci %u %u%s", - indent, neigh->bts->location_area_code, neigh->bts->cell_identity, - VTY_NEWLINE); + vty_out(vty, "%sneighbor bts %u%s", indent, neigh->bts->nr, VTY_NEWLINE); } } diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 02b0f50..4f86383 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -241,8 +241,8 @@ ... !neighbor bts 0 ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor cgi 023 42 423 5 arfcn 23 bsic 42 neighbor cgi 023 042 423 6 arfcn 23 bsic 42 neighbor cgi 023 042 234 56 arfcn 23 bsic 42 @@ -272,8 +272,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac 456 arfcn 123 bsic 45 neighbor lac-ci 789 10 arfcn 423 bsic any neighbor lac-ci 789 10 arfcn 423 bsic 63 @@ -285,8 +285,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic any neighbor lac-ci 789 10 arfcn 423 bsic 63 neighbor lac-ci 789 10 arfcn 423 bsic 1 @@ -297,8 +297,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic 63 neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor @@ -308,8 +308,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor @@ -318,8 +318,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any @@ -327,7 +327,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 22 65535 + neighbor bts 2 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any @@ -335,7 +335,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 22 65535 + neighbor bts 2 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12 -- To view, visit https://gerrit.osmocom.org/11127 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: I35783f9624eacbdffccdb59a0179ffda54a26990 Gerrit-Change-Number: 11127 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:32:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:32:56 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: identify neighbors by gsm0808 cell id Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11128 Change subject: neighbor vty: identify neighbors by gsm0808 cell id ...................................................................... neighbor vty: identify neighbors by gsm0808 cell id For deleting neighbor entries and for triggering manual handovers, it is useful to identify neighbors by the gsm0808_cell_id, instead of just by ARFCN+BSIC. This is not a hard requirement, since BTS+ARFCN+BSIC fully identifies a neighbor. But consider these contrived examples of the situation before this patch: # bts 0 # neighbor cgi 001 01 23 42 # no neighbor cgi 001 01 23 42 % No such command # no neighbor bts 5 (manually looked up that BTS 5 has above CGI) # neighbor lac 42 arfcn 23 bsic 5 # do handover any to lac 42 % No such command # do handover any to arfcn 23 bsic 5 (if multiple cells have the same ARFCN+BSIC, the identification is not unique) So this fills a gap, if only to help debugging / analyzing handover operations. Change-Id: I198fe7055d1e09b128693eb51276e3d8cde1c0ba --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/neighbor_ident_vty.c A src/osmo-bsc/neighbor_iter.c M tests/neighbor_ident.vty 5 files changed, 502 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/11128/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 33a5a8d..ae65f09 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1141,6 +1141,21 @@ int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor); int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor); +typedef bool (*neighbors_find_by_cell_id_cb_t)(struct gsm_bts *from_bts, + struct gsm_bts *neighbor_bts, + const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + int val_idx, + void *cb_data); +int neighbors_find_by_cell_id(struct gsm_network *net, + struct gsm_bts *for_bts, + struct neighbor_ident_list *neighbor_bss_cells, + const struct gsm0808_cell_id *id, + bool remote_neighbors_exact_match, + bool remote_neighbors_all_matches, + neighbors_find_by_cell_id_cb_t cb, + void *cb_data); + struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 364228d..c96ebb5 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -73,6 +73,7 @@ mgw_endpoint_fsm.c \ neighbor_ident.c \ neighbor_ident_vty.c \ + neighbor_iter.c \ net_init.c \ gsm_08_08.c \ osmo_bsc_bssap.c \ diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 409153b..1dbced8 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -86,6 +86,13 @@ #define LOCAL_BTS_PARAMS "bts <0-255>" #define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n" +#define SHOW_BTS_PARAMS "show " LOCAL_BTS_PARAMS +#define SHOW_BTS_DOC SHOW_STR "Display information about a BTS\n" "BTS number\n" + +#define SHOW_BTS_NEIGHBOR_PARAMS SHOW_BTS_PARAMS " neighbor" +#define SHOW_BTS_NEIGHBOR_DOC SHOW_BTS_DOC \ + "List this cell's neighbors matching the given criteria\n" + static struct gsm_bts *neighbor_ident_vty_parse_bts_nr(struct vty *vty, const char **argv) { const char *bts_nr_str = argv[0]; @@ -186,7 +193,7 @@ return CMD_SUCCESS; } -static int del_local_bts(struct vty *vty, struct gsm_bts *neigh) +static int del_local_bts_neighbor(struct vty *vty, struct gsm_bts *neigh) { int rc; struct gsm_bts *bts = vty->index; @@ -211,12 +218,123 @@ neigh->nr, bts->nr, strerror(-rc), VTY_NEWLINE); return CMD_WARNING; } - if (rc == 0) + if (rc == 0) { vty_out(vty, "%% BTS %u is no neighbor of BTS %u%s", neigh->nr, bts->nr, VTY_NEWLINE); + return CMD_WARNING; + } + vty_out(vty, "%% Removed from BTS %u local neighbor BTS %u%s", bts->nr, neigh->nr, VTY_NEWLINE); return CMD_SUCCESS; } +static int del_remote_neighbor(struct vty *vty, const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val) +{ + vty_out(vty, "%% Removing remote neighbor: %s %s%s", + neighbor_ident_key_name(key), + gsm0808_cell_id_list_name(val), + VTY_NEWLINE); + if (!neighbor_ident_del(g_neighbor_cells, key)) { + vty_out(vty, "%% Error: removing neighbor failed%s", VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + +struct del_local_or_remote_neighbor_iter_data { + struct vty *vty; + struct gsm_bts *bts; + const struct gsm0808_cell_id *id; + int count_local; + int count_remote; +}; + +static bool del_local_or_remote_neighbor_iter_cb_count(struct gsm_bts *from_bts, + struct gsm_bts *neighbor_bts, + const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + int val_idx, + void *cb_data) +{ + struct del_local_or_remote_neighbor_iter_data *d = cb_data; + if (neighbor_bts) + d->count_local++; + else + d->count_remote++; + return true; +} + +static bool del_local_or_remote_neighbor_iter_cb_list(struct gsm_bts *from_bts, + struct gsm_bts *neighbor_bts, + const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + int val_idx, + void *cb_data) +{ + struct del_local_or_remote_neighbor_iter_data *d = cb_data; + struct vty *vty = d->vty; + if (neighbor_bts) + vty_out(vty, "%% BTS %u has local neighbor BTS %u%s", + d->bts->nr, neighbor_bts->nr, VTY_NEWLINE); + else + vty_out(vty, "%% Remote neighbor %s %s%s", + neighbor_ident_key_name(key), + gsm0808_cell_id_list_name(val), VTY_NEWLINE); + return true; +} + +static bool del_local_or_remote_neighbor_iter_cb_del(struct gsm_bts *from_bts, + struct gsm_bts *neighbor_bts, + const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + int val_idx, + void *cb_data) +{ + struct del_local_or_remote_neighbor_iter_data *d = cb_data; + + if (neighbor_bts) + del_local_bts_neighbor(d->vty, neighbor_bts); + else + del_remote_neighbor(d->vty, key, val); + return true; +} + +static int del_local_or_remote_neighbor(struct vty *vty, const struct gsm0808_cell_id *id, + bool allow_multiple_matches) +{ + struct del_local_or_remote_neighbor_iter_data d = { + .vty = vty, + .bts = vty->index, + .id = id, + }; + int total; + + if (vty->node != BTS_NODE) + d.bts = NULL; + + neighbors_find_by_cell_id(g_net, d.bts, g_neighbor_cells, id, true, true, + del_local_or_remote_neighbor_iter_cb_count, &d); + + total = d.count_local + d.count_remote; + if (!total) { + vty_out(vty, "%% No matching neighbor%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (total > 1 && !allow_multiple_matches) { + vty_out(vty, "%% More than one match found:%s", VTY_NEWLINE); + neighbors_find_by_cell_id(g_net, d.bts, g_neighbor_cells, id, true, true, + del_local_or_remote_neighbor_iter_cb_list, + &d); + return CMD_WARNING; + } + + total = neighbors_find_by_cell_id(g_net, d.bts, g_neighbor_cells, id, true, true, + del_local_or_remote_neighbor_iter_cb_del, &d); + return CMD_SUCCESS; +} + + DEFUN(cfg_neighbor_add_bts_nr, cfg_neighbor_add_bts_nr_cmd, NEIGHBOR_ADD_CMD LOCAL_BTS_PARAMS, NEIGHBOR_ADD_DOC LOCAL_BTS_DOC) @@ -342,7 +460,7 @@ continue; rc = gsm_bts_local_neighbor_del(bts, neigh->bts); if (rc > 0) { - vty_out(vty, "%% Removed local neighbor bts %u to bts %u%s", + vty_out(vty, "%% Removed from BTS %u local neighbor BTS %u%s", bts->nr, neigh_bts->nr, VTY_NEWLINE); removed += rc; } @@ -405,7 +523,7 @@ 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)); + return del_local_bts_neighbor(vty, neighbor_ident_vty_parse_bts_nr(vty, argv)); } DEFUN(cfg_neighbor_del_arfcn_bsic, cfg_neighbor_del_arfcn_bsic_cmd, @@ -420,12 +538,76 @@ return del_by_key(vty, &key); } +DEFUN(cfg_neighbor_del_lac, cfg_neighbor_del_lac_cmd, + NEIGHBOR_DEL_CMD LAC_PARAMS, + NEIGHBOR_DEL_DOC LAC_DOC) +{ + return del_local_or_remote_neighbor(vty, neighbor_ident_vty_parse_lac(vty, argv), false); +} + +DEFUN(cfg_neighbor_del_lac_ci, cfg_neighbor_del_lac_ci_cmd, + NEIGHBOR_DEL_CMD LAC_CI_PARAMS, + NEIGHBOR_DEL_DOC LAC_CI_DOC) +{ + return del_local_or_remote_neighbor(vty, neighbor_ident_vty_parse_lac(vty, argv), false); +} + +DEFUN(cfg_neighbor_del_cgi, cfg_neighbor_del_cgi_cmd, + NEIGHBOR_DEL_CMD CGI_PARAMS, + NEIGHBOR_DEL_DOC CGI_DOC) +{ + return del_local_or_remote_neighbor(vty, neighbor_ident_vty_parse_lac(vty, argv), false); +} + + struct write_neighbor_ident_entry_data { struct vty *vty; const char *indent; struct gsm_bts *bts; }; +static void write_neighbor_ident_list_entry(struct vty *vty, + const char *indent, + const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + int idx) +{ + if (idx >= val->id_list_len) + return; + +#define NEIGH_BSS_WRITE(fmt, args...) do { \ + vty_out(vty, "%sneighbor " fmt " arfcn %u ", indent, ## args, key->arfcn); \ + if (key->bsic == BSIC_ANY) \ + vty_out(vty, "bsic any"); \ + else \ + vty_out(vty, "bsic %u", key->bsic & 0x3f); \ + vty_out(vty, "%s", VTY_NEWLINE); \ + } while(0) + + switch (val->id_discr) { + case CELL_IDENT_LAC: + NEIGH_BSS_WRITE("lac %u", val->id_list[idx].lac); + break; + case CELL_IDENT_LAC_AND_CI: + NEIGH_BSS_WRITE("lac-ci %u %u", + val->id_list[idx].lac_and_ci.lac, + val->id_list[idx].lac_and_ci.ci); + break; + case CELL_IDENT_WHOLE_GLOBAL: + { + const struct osmo_cell_global_id *cgi = &val->id_list[idx].global; + NEIGH_BSS_WRITE("cgi %s %s %u %u", + osmo_mcc_name(cgi->lai.plmn.mcc), + osmo_mnc_name(cgi->lai.plmn.mnc, cgi->lai.plmn.mnc_3_digits), + cgi->lai.lac, cgi->cell_identity); + } + break; + default: + vty_out(vty, "%% Unsupported Cell Identity type: %d%s", val->id_discr, VTY_NEWLINE); + } +#undef NEIGH_BSS_WRITE +} + static bool write_neighbor_ident_list(const struct neighbor_ident_key *key, const struct gsm0808_cell_id_list2 *val, void *cb_data) @@ -440,42 +622,9 @@ } else if (key->from_bts != NEIGHBOR_IDENT_KEY_ANY_BTS) return true; -#define NEIGH_BSS_WRITE(fmt, args...) do { \ - vty_out(vty, "%sneighbor " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \ - if (key->bsic == BSIC_ANY) \ - vty_out(vty, "bsic any"); \ - else \ - vty_out(vty, "bsic %u", key->bsic & 0x3f); \ - vty_out(vty, "%s", VTY_NEWLINE); \ - } while(0) - - switch (val->id_discr) { - case CELL_IDENT_LAC: - for (i = 0; i < val->id_list_len; i++) { - NEIGH_BSS_WRITE("lac %u", val->id_list[i].lac); - } - break; - case CELL_IDENT_LAC_AND_CI: - for (i = 0; i < val->id_list_len; i++) { - NEIGH_BSS_WRITE("lac-ci %u %u", - val->id_list[i].lac_and_ci.lac, - val->id_list[i].lac_and_ci.ci); - } - break; - case CELL_IDENT_WHOLE_GLOBAL: - for (i = 0; i < val->id_list_len; i++) { - const struct osmo_cell_global_id *cgi = &val->id_list[i].global; - NEIGH_BSS_WRITE("cgi %s %s %u %u", - osmo_mcc_name(cgi->lai.plmn.mcc), - osmo_mnc_name(cgi->lai.plmn.mnc, cgi->lai.plmn.mnc_3_digits), - cgi->lai.lac, cgi->cell_identity); - } - break; - default: - vty_out(vty, "%% Unsupported Cell Identity%s", VTY_NEWLINE); + for (i = 0; i < val->id_list_len; i++) { + write_neighbor_ident_list_entry(vty, d->indent, key, val, i); } -#undef NEIGH_BSS_WRITE - return true; } @@ -490,12 +639,17 @@ neighbor_ident_iter(g_neighbor_cells, write_neighbor_ident_list, &d); } +void neighbor_ident_vty_write_local_neighbor(struct vty *vty, const char *indent, struct gsm_bts *neighbor_bts) +{ + vty_out(vty, "%sneighbor bts %u%s", indent, neighbor_bts->nr, VTY_NEWLINE); +} + void neighbor_ident_vty_write_local_neighbors(struct vty *vty, const char *indent, struct gsm_bts *bts) { struct gsm_bts_ref *neigh; llist_for_each_entry(neigh, &bts->local_neighbors, entry) { - vty_out(vty, "%sneighbor bts %u%s", indent, neigh->bts->nr, VTY_NEWLINE); + neighbor_ident_vty_write_local_neighbor(vty, indent, neigh->bts); } } @@ -505,11 +659,25 @@ neighbor_ident_vty_write_remote_bss(vty, indent, bts); } -DEFUN(show_bts_neighbor, show_bts_neighbor_cmd, - "show bts <0-255> neighbor " NEIGHBOR_IDENT_VTY_KEY_PARAMS, - SHOW_STR "Display information about a BTS\n" "BTS number\n" - "Query which cell would be the target for this neighbor ARFCN+BSIC\n" - NEIGHBOR_IDENT_VTY_KEY_DOC) +DEFUN(show_bts_neighbor_all, show_bts_neighbor_all_cmd, + SHOW_BTS_NEIGHBOR_PARAMS " all", + SHOW_BTS_NEIGHBOR_DOC "List all neighbors\n") +{ + struct gsm_bts *bts = gsm_bts_num(g_net, atoi(argv[0])); + + if (!bts) { + vty_out(vty, "%% Error: cannot find BTS '%s'%s", argv[0], + VTY_NEWLINE); + return CMD_WARNING; + } + + neighbor_ident_vty_write(vty, "% ", bts); + return CMD_SUCCESS; +} + +DEFUN(show_bts_neighbor_arfcn, show_bts_neighbor_arfcn_cmd, + SHOW_BTS_NEIGHBOR_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + SHOW_BTS_NEIGHBOR_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { int found = 0; struct neighbor_ident_key key; @@ -553,6 +721,57 @@ return CMD_SUCCESS; } +static bool show_neighbor_by_cell_id_cb(struct gsm_bts *from_bts, + struct gsm_bts *neighbor_bts, + const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + int val_idx, + void *cb_data) +{ + struct vty *vty = cb_data; + if (neighbor_bts) + neighbor_ident_vty_write_local_neighbor(vty, "% ", neighbor_bts); + else + write_neighbor_ident_list_entry(vty, "% ", key, val, val_idx); + return true; +} + +static int show_neighbor_by_cell_id(struct vty *vty, const char **argv, const struct gsm0808_cell_id *id) +{ + struct gsm_bts *bts = gsm_bts_num(g_net, atoi(argv[0])); + + if (!bts) { + vty_out(vty, "%% Error: cannot find BTS '%s'%s", argv[0], + VTY_NEWLINE); + return CMD_WARNING; + } + + neighbors_find_by_cell_id(g_net, bts, g_neighbor_cells, id, false, true, + show_neighbor_by_cell_id_cb, vty); + return CMD_SUCCESS; +} + +DEFUN(show_bts_neighbor_lac, show_bts_neighbor_lac_cmd, + SHOW_BTS_NEIGHBOR_PARAMS " " LAC_PARAMS, + SHOW_BTS_NEIGHBOR_DOC LAC_DOC) +{ + return show_neighbor_by_cell_id(vty, argv, neighbor_ident_vty_parse_lac(vty, &argv[1])); +} + +DEFUN(show_bts_neighbor_lac_ci, show_bts_neighbor_lac_ci_cmd, + SHOW_BTS_NEIGHBOR_PARAMS " " LAC_CI_PARAMS, + SHOW_BTS_NEIGHBOR_DOC LAC_CI_DOC) +{ + return show_neighbor_by_cell_id(vty, argv, neighbor_ident_vty_parse_lac_ci(vty, &argv[1])); +} + +DEFUN(show_bts_neighbor_cgi, show_bts_neighbor_cgi_cmd, + SHOW_BTS_NEIGHBOR_PARAMS " " CGI_PARAMS, + SHOW_BTS_NEIGHBOR_DOC CGI_DOC) +{ + return show_neighbor_by_cell_id(vty, argv, neighbor_ident_vty_parse_cgi(vty, &argv[1])); +} + void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil) { g_net = net; @@ -566,5 +785,12 @@ install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd); install_element(BTS_NODE, &cfg_neighbor_del_bts_nr_cmd); install_element(BTS_NODE, &cfg_neighbor_del_arfcn_bsic_cmd); - install_element_ve(&show_bts_neighbor_cmd); + install_element(BTS_NODE, &cfg_neighbor_del_lac_cmd); + install_element(BTS_NODE, &cfg_neighbor_del_lac_ci_cmd); + install_element(BTS_NODE, &cfg_neighbor_del_cgi_cmd); + install_element_ve(&show_bts_neighbor_all_cmd); + install_element_ve(&show_bts_neighbor_arfcn_cmd); + install_element_ve(&show_bts_neighbor_lac_cmd); + install_element_ve(&show_bts_neighbor_lac_ci_cmd); + install_element_ve(&show_bts_neighbor_cgi_cmd); } diff --git a/src/osmo-bsc/neighbor_iter.c b/src/osmo-bsc/neighbor_iter.c new file mode 100644 index 0000000..7980773 --- /dev/null +++ b/src/osmo-bsc/neighbor_iter.c @@ -0,0 +1,152 @@ +/* Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +/* This file implements iteration of both local and remote neighbors, which has dependencies to both + * gsm_data.c as well as neighbor_ident.c. Placing this in gsm_data.c would require various tools to + * include the neighbor_ident.c implementations. In turn, neighbor_ident.c is gsm_data.c agnostic. */ + +#include +#include + +static int bts_local_neighbors_find_by_cell_id(struct gsm_bts *for_bts, + const struct gsm0808_cell_id *id, + neighbors_find_by_cell_id_cb_t cb, + void *cb_data) +{ + int count = 0; + struct gsm_bts_ref *ref, *ref_next; + llist_for_each_entry_safe(ref, ref_next, &for_bts->local_neighbors, entry) { + if (!id || gsm_bts_matches_cell_id(ref->bts, id)) { + if (cb) + cb(for_bts, ref->bts, NULL, NULL, -1, cb_data); + count ++; + } + } + return count; +} + +static int all_local_neighbors_find_by_cell_id(struct gsm_network *net, + const struct gsm0808_cell_id *id, + neighbors_find_by_cell_id_cb_t cb, + void *cb_data) +{ + struct gsm_bts *bts, *bts_next; + int count = 0; + llist_for_each_entry_safe(bts, bts_next, &net->bts_list, list) { + count += bts_local_neighbors_find_by_cell_id(bts, id, cb, cb_data); + } + return count; +} + +struct neighbors_find_by_cell_id_iter_cb_data { + struct gsm_network *net; + const struct gsm0808_cell_id *id; + bool all_matches; + neighbors_find_by_cell_id_cb_t cb; + void *cb_data; + int count; +}; + +static bool neighbors_find_by_cell_id_iter_cb(const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + void *cb_data) +{ + struct neighbors_find_by_cell_id_iter_cb_data *d = cb_data; + unsigned int match_nr; + int match_idx; + + for (match_nr = 0; ; match_nr ++) { + /* On mismatch, just continue iterating. */ + match_idx = gsm0808_cell_id_matches_list(d->id, val, match_nr); + if (match_idx < 0) + return true; + + /* Match! */ + if (d->cb) + d->cb(d->net ? gsm_bts_num(d->net, key->from_bts) : NULL, + NULL, + key, val, + match_idx, + d->cb_data); + d->count ++; + + /* If neighbors_find_by_cell_id() was invoked with remote_neighbors_all_matches == false, + * stop looking after the first match in this list. */ + if (!d->all_matches) + return true; + } + return true; +} + +/* Find all neighbors that match a given Cell Identifier. + * If 'for_bts' is given, only neighbors for that cell are returned; NULL matches all cells' neighbors. + * If 'neighbor_bss_cells' is NULL, no remote neighbors are returned. + * If 'id' is NULL, all neighbors are returned. The id restricts the matches, where a CGI type is most + * restrictive, and a LAC type might still match a neighbor with LAC+CI or a neighbor with full CGI that + * contains this LAC. + * Results are returned by calling the cb(). If cb() returns false, further iteration is stopped. + * It is safe to remove any neighbor entries, except the neighbor entry *following* the one passed to + * cb(), i.e. you may remove the neighbor passed to cb(), but not the adjacent following llist entry. + * + * With remote_neighbors_exact_match == true, ignore remote-BSS neighbors with a cell id list that have a + * CELL_IDENT that differs from the id->id_discr. With false, any matching cell id item counts, e.g. a + * LAC of 23 matches a CGI that contains a LAC = 23. + * + * With remote_neighbors_all_matches == false, return only the first match in each cell id list of a + * remote neighbor. With true, cb() will be invoked for each matching val_idx in the given cell id list. + */ +int neighbors_find_by_cell_id(struct gsm_network *net, + struct gsm_bts *for_bts, + struct neighbor_ident_list *neighbor_bss_cells, + const struct gsm0808_cell_id *id, + bool remote_neighbors_exact_match, + bool remote_neighbors_all_matches, + neighbors_find_by_cell_id_cb_t cb, + void *cb_data) +{ + int count = 0; + + /* Local neighbors */ + if (for_bts) { + count += bts_local_neighbors_find_by_cell_id(for_bts, id, cb, cb_data); + if (!net) + net = for_bts->network; + } else if (net) + count += all_local_neighbors_find_by_cell_id(net, id, cb, cb_data); + + /* Remote neighbors */ + if (neighbor_bss_cells) { + struct neighbors_find_by_cell_id_iter_cb_data d = { + .net = net, + .id = id, + .all_matches = remote_neighbors_all_matches, + .cb = cb, + .cb_data = cb_data, + }; + + neighbor_ident_iter(neighbor_bss_cells, + neighbors_find_by_cell_id_iter_cb, + &d); + count += d.count; + } + return count; +} diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 4f86383..9e2b100 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -162,8 +162,11 @@ neighbor Remove local or remote-BSS neighbor cell OsmoBSC(config-net-bts)# no neighbor ? - bts Neighbor cell by local BTS number - arfcn ARFCN of neighbor cell + bts Neighbor cell by local BTS number + arfcn ARFCN of neighbor cell + lac Neighbor cell by LAC + lac-ci Neighbor cell by LAC and CI + cgi Neighbor cell by cgi OsmoBSC(config-net-bts)# no neighbor bts ? <0-255> BTS number @@ -195,10 +198,31 @@ OsmoBSC(config-net-bts)# neighbor bts 1 % BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 +OsmoBSC(config-net-bts)# no neighbor bts 1 +% Removed from BTS 0 local neighbor BTS 1 + +OsmoBSC(config-net-bts)# neighbor lac 21 +% BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 +OsmoBSC(config-net-bts)# no neighbor lac 21 +% Removed from BTS 0 local neighbor BTS 1 + +OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 +% BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 +OsmoBSC(config-net-bts)# no neighbor lac-ci 21 31 +% Removed from BTS 0 local neighbor BTS 1 + +OsmoBSC(config-net-bts)# neighbor cgi 901 70 21 31 +% BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 +OsmoBSC(config-net-bts)# no neighbor cgi 901 70 21 31 +% No matching neighbor + +OsmoBSC(config-net-bts)# neighbor bts 1 +% BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 OsmoBSC(config-net-bts)# neighbor lac 22 % BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 OsmoBSC(config-net-bts)# no neighbor bts 2 +% Removed from BTS 0 local neighbor BTS 2 OsmoBSC(config-net-bts)# neighbor cgi 901 70 22 65535 % BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 @@ -264,6 +288,40 @@ OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23 % neighbor lac-ci 789 10 arfcn 423 bsic 23 +OsmoBSC(config-net-bts)# do show bts 0 neighbor all +% neighbor bts 1 +% neighbor bts 2 +% neighbor cgi 023 42 423 5 arfcn 23 bsic 42 +% neighbor cgi 023 042 423 6 arfcn 23 bsic 42 +% neighbor cgi 023 042 234 56 arfcn 23 bsic 42 +% neighbor lac 456 arfcn 123 bsic 45 +% neighbor lac-ci 789 10 arfcn 423 bsic any +% neighbor lac-ci 789 10 arfcn 423 bsic 63 +% neighbor lac-ci 789 10 arfcn 423 bsic 1 + +OsmoBSC(config-net-bts)# do show bts 0 neighbor cgi 23 42 423 5 +% neighbor cgi 023 42 423 5 arfcn 23 bsic 42 + +OsmoBSC(config-net-bts)# do show bts 0 neighbor lac 456 +% neighbor lac 456 arfcn 123 bsic 45 + +OsmoBSC(config-net-bts)# do show bts 0 neighbor lac-ci 789 10 +% neighbor lac-ci 789 10 arfcn 423 bsic any +% neighbor lac-ci 789 10 arfcn 423 bsic 63 +% neighbor lac-ci 789 10 arfcn 423 bsic 1 + +OsmoBSC(config-net-bts)# do show bts 0 neighbor lac 789 +% neighbor lac-ci 789 10 arfcn 423 bsic any +% neighbor lac-ci 789 10 arfcn 423 bsic 63 +% neighbor lac-ci 789 10 arfcn 423 bsic 1 + +OsmoBSC(config-net-bts)# do show bts 0 neighbor lac 423 +% neighbor cgi 023 42 423 5 arfcn 23 bsic 42 +% neighbor cgi 023 042 423 6 arfcn 23 bsic 42 + +OsmoBSC(config-net-bts)# do show bts 0 neighbor lac-ci 423 6 +% neighbor cgi 023 042 423 6 arfcn 23 bsic 42 + OsmoBSC(config-net-bts)# no neighbor arfcn 99 bsic 7 % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7 @@ -323,7 +381,7 @@ ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any -% Removed local neighbor bts 0 to bts 1 +% Removed from BTS 0 local neighbor BTS 1 OsmoBSC(config-net-bts)# show running-config ... !neighbor @@ -339,7 +397,7 @@ ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12 -% Removed local neighbor bts 0 to bts 2 +% Removed from BTS 0 local neighbor BTS 2 OsmoBSC(config-net-bts)# show running-config ... !neighbor -- To view, visit https://gerrit.osmocom.org/11128 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: I198fe7055d1e09b128693eb51276e3d8cde1c0ba Gerrit-Change-Number: 11128 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 01:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:34:58 +0000 Subject: Change in osmo-sgsn[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11107 to look at the new patch set (#2). Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: Ie267aa014812b5c89f2268a65566d5427aa1ad7e --- M src/gprs/sgsn_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/11107/2 -- To view, visit https://gerrit.osmocom.org/11107 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: Ie267aa014812b5c89f2268a65566d5427aa1ad7e Gerrit-Change-Number: 11107 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 Thu Sep 27 01:35:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:35:11 +0000 Subject: Change in osmo-msc[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11106 to look at the new patch set (#2). Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: I245b153785f615b998bb5279cb8d93787d57b4b7 --- 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/06/11106/2 -- To view, visit https://gerrit.osmocom.org/11106 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: I245b153785f615b998bb5279cb8d93787d57b4b7 Gerrit-Change-Number: 11106 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 Thu Sep 27 01:35:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 01:35:21 +0000 Subject: Change in osmo-iuh[master]: hnbgw: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11108 to look at the new patch set (#2). Change subject: hnbgw: vty: add SCCP related vty commands ...................................................................... hnbgw: vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/08/11108/2 -- To view, visit https://gerrit.osmocom.org/11108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 Gerrit-Change-Number: 11108 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 Thu Sep 27 06:57:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 06:57:48 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: sccp_scoc.c: fix timers definition units In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11110 ) Change subject: cosmetic: sccp_scoc.c: fix timers definition units ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11110 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: Ia6c893f734fbdc88873c4ef80f6cacf01ee7763a Gerrit-Change-Number: 11110 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 06:57: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 Sep 27 06:57:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 06:57:59 +0000 Subject: Change in libosmo-sccp[master]: drop inaccurate comment from osmo_ss7_vty.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11111 ) Change subject: drop inaccurate comment from osmo_ss7_vty.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11111 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: I845f6661eaed361b5d4db88140efb8eb79b6b69d Gerrit-Change-Number: 11111 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 06:57:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 06:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 06:59:48 +0000 Subject: Change in libosmo-sccp[master]: allow less characters for SCCP address book entries In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11112 ) Change subject: allow less characters for SCCP address book entries ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11112/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11112/1//COMMIT_MSG at 11 PS1, Line 11: 32 is plenty please note that the RKM and other code dynamically generates names (and I don't know what the max generated length is), but I think only for ASP and AS, not for SCCP address book entries. https://gerrit.osmocom.org/#/c/11112/1//COMMIT_MSG at 13 PS1, Line 13: Though libosmo-sigtran becomes binary-backwards-incompatible whoy does it become incompatible? The structure you modified is not in a header file but only in a C file. It seems entirely self-contained. So the only incompatibility that should occur is if somebody used names > 32 characters length. -- To view, visit https://gerrit.osmocom.org/11112 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: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a Gerrit-Change-Number: 11112 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 27 Sep 2018 06:59:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 07:00:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:00:09 +0000 Subject: Change in libosmo-sccp[master]: vty: fix 'show asp' from within 'asp' node In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11113 ) Change subject: vty: fix 'show asp' from within 'asp' node ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11113 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: I3ebf498492c6ba69a5dd1c9f36acdabfd6fbdfe1 Gerrit-Change-Number: 11113 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:00: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 Sep 27 07:00:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:00:42 +0000 Subject: Change in libosmo-sccp[master]: add tests/vty: VTY UI transcript testing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11114 ) Change subject: add tests/vty: VTY UI transcript testing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11114 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: I6a28684fa24d6e7de568623444297028eba2ab8c Gerrit-Change-Number: 11114 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:00: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 Sep 27 07:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:02:38 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: define SCCP_STR once In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11115 ) Change subject: sccp_vty: define SCCP_STR once ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11115/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11115/1//COMMIT_MSG at 12 PS1, Line 12: Fix "Signaling" to "Signalling" that may actually not be a fix, strictly speaking. I've definitely seen both spellings in the various specs I've read. But anyway, Q.711 uses two "l", so let's keep your fix. -- To view, visit https://gerrit.osmocom.org/11115 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: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 Gerrit-Change-Number: 11115 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:02:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 07:03:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:03:06 +0000 Subject: Change in libosmo-sccp[master]: vty: tweak two printed strings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11116 ) Change subject: vty: tweak two printed strings ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11116 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: Iebb976531576268d58338895a4baadbca6137b80 Gerrit-Change-Number: 11116 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:03: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 Sep 27 07:04:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:04:10 +0000 Subject: Change in libosmo-sccp[master]: vty: install 'show cs7' for sccp addrs on _ve nodes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11117 ) Change subject: vty: install 'show cs7' for sccp addrs on _ve nodes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11117 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: I80e0bc0a91bcd3fb75372045db34592d2d663d41 Gerrit-Change-Number: 11117 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:04:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 07:04:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:04:43 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: allocate ss7->sccp in one common function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11118 ) Change subject: cosmetic: allocate ss7->sccp in one common function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11118 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: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 Gerrit-Change-Number: 11118 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:04: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 Sep 27 07:34:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:34:11 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11120 ) Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... Patch Set 2: Code-Review-1 you are breaking legacy users of libsccp + libmtp (like cellmgr-ng) with such changes. They existed long before libosmo-sigtran and I don't really see any rationale for substantial changes like this. -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:34: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 Sep 27 07:38:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:38:48 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: fix doc strings for show ... ssn, connections In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11121 ) Change subject: sccp_vty: fix doc strings for show ... ssn,connections ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11121 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: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e Gerrit-Change-Number: 11121 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:38: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 Sep 27 07:40:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:40:04 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... Patch Set 2: Code-Review-1 As mentioned (IIRC) in the related redmine ticket, this way of specifying timer durations (with unit suffix) differs from the tradiitonal way how other timers are specified in the VTY. I would always argue in favor of consistency here. -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:40: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 Sep 27 07:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:41:36 +0000 Subject: Change in osmo-bsc[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11109 ) Change subject: vty: add SCCP related vty commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11109 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: I2eb7f5cf9ffceeeb14882190d8545601795d3288 Gerrit-Change-Number: 11109 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 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 Thu Sep 27 07:41:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:41:59 +0000 Subject: Change in osmo-sgsn[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11107 ) Change subject: vty: add SCCP related vty commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11107 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: Ie267aa014812b5c89f2268a65566d5427aa1ad7e Gerrit-Change-Number: 11107 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:41:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 07:42:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:42:11 +0000 Subject: Change in osmo-iuh[master]: hnbgw: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11108 ) Change subject: hnbgw: vty: add SCCP related vty commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11108 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: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 Gerrit-Change-Number: 11108 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:42: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 Sep 27 07:42:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:42:17 +0000 Subject: Change in osmo-msc[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11106 ) Change subject: vty: add SCCP related vty commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11106 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: I245b153785f615b998bb5279cb8d93787d57b4b7 Gerrit-Change-Number: 11106 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:42:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 07:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:43:10 +0000 Subject: Change in osmo-bsc[master]: make: allow vty-tests without configure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11122 ) Change subject: make: allow vty-tests without configure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11122 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: I8cb165890ed77bea8ae82f5228828fa19ff7e0b9 Gerrit-Change-Number: 11122 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07: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 Thu Sep 27 07:43:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:43:45 +0000 Subject: Change in osmo-bsc[master]: test neighbor ident vty docs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11123 ) Change subject: test neighbor ident vty docs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11123 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: I83a2b03c6a081c4ed3225d79d342913a261d9c1c Gerrit-Change-Number: 11123 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:43:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 07:46:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:46:58 +0000 Subject: Change in osmo-bsc[master]: vty: write local neighbors by bts nr, not lac-ci In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11127 ) Change subject: vty: write local neighbors by bts nr, not lac-ci ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11127 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: I35783f9624eacbdffccdb59a0179ffda54a26990 Gerrit-Change-Number: 11127 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:46: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 Sep 27 07:47:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 07:47:30 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: allow setting local neighbors by CGI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11126 ) Change subject: neighbor vty: allow setting local neighbors by CGI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11126 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: I2d03de6b695904c4a86025bf250358d04f6e47de Gerrit-Change-Number: 11126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 07:47: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 Sep 27 08:38:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 08:38:24 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: drop keyword 'add' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11124 ) Change subject: neighbor vty: drop keyword 'add' ...................................................................... Patch Set 1: Code-Review+2 this is the kind of patch where I'm wondering if it's worth spending time on... -- To view, visit https://gerrit.osmocom.org/11124 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: I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8 Gerrit-Change-Number: 11124 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 08:38: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 Sep 27 08:38:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 08:38:38 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: rather 'no neighbor', not 'neighbor del' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11125 ) Change subject: neighbor vty: rather 'no neighbor', not 'neighbor del' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11125 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: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 Gerrit-Change-Number: 11125 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 08:38: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 Sep 27 08:39:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 08:39:09 +0000 Subject: Change in libosmocore[master]: utils/osmo-config-merge: explicitly return from main() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11104 ) Change subject: utils/osmo-config-merge: explicitly return from main() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11104 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: I7a80a85c8b3180dc086cd9fd20356aab16ea8100 Gerrit-Change-Number: 11104 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 08:39: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 Sep 27 08:39:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 08:39:10 +0000 Subject: Change in libosmocore[master]: utils/osmo-config-merge: explicitly return from main() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11104 ) Change subject: utils/osmo-config-merge: explicitly return from main() ...................................................................... utils/osmo-config-merge: explicitly return from main() This change fixes the following compiler warning: osmo-config-merge.c: In function ?main?: osmo-config-merge.c:268:1: warning: control reaches end of non-void function [-Wreturn-type] Despite it isn't critical, let's get rid of this warning. Change-Id: I7a80a85c8b3180dc086cd9fd20356aab16ea8100 --- M utils/osmo-config-merge.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index 3762c67..c76e42d 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -265,4 +265,6 @@ /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */ talloc_free(patch_tree); talloc_free(base_tree); + + return 0; } -- To view, visit https://gerrit.osmocom.org/11104 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: I7a80a85c8b3180dc086cd9fd20356aab16ea8100 Gerrit-Change-Number: 11104 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 27 11:59:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 11:59:53 +0000 Subject: Change in osmo-iuh[master]: hnbgw: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11108 ) Change subject: hnbgw: vty: add SCCP related vty commands ...................................................................... hnbgw: vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hnbgw.c b/src/hnbgw.c index 91e551b..cd6104b 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -524,6 +524,7 @@ vty_init(&vty_info); osmo_ss7_vty_init_asp(tall_hnb_ctx); + osmo_sccp_vty_init(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); logging_vty_add_cmds(&hnbgw_log_info); -- To view, visit https://gerrit.osmocom.org/11108 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: I2f81e078d7a26dd39f8ff9d0f9273ee1a3434232 Gerrit-Change-Number: 11108 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 Sep 27 12:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:02:28 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11120 ) Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... Patch Set 2: The installation target does not change. Are those programs including code from the source tree directly? Otherwise I don't see how this can break anything? (btw, the master build for cellmgr-ng has been broken for ages now.) -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 12:02:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 12:11:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:11:00 +0000 Subject: Change in libosmo-sccp[master]: allow less characters for SCCP address book entries In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11112 ) Change subject: allow less characters for SCCP address book entries ...................................................................... Patch Set 1: Ah, that's right, no binary incompat then! We don't generate address book entries, all are user supplied. Literally the only place allocating entries and setting names is the 'sccp-addr NAME' vty command implementation. So yes, we're only breaking configs where previously longer names were supplied. My take on this is that they don't exist anyway. I know it's generally bad to assume such things, but I'm still thinking all of this is fairly new anyway? -- To view, visit https://gerrit.osmocom.org/11112 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: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a Gerrit-Change-Number: 11112 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 27 Sep 2018 12:11:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 12:13:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:13:04 +0000 Subject: Change in libosmo-sccp[master]: allow less characters for SCCP address book entries In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11112 to look at the new patch set (#2). Change subject: allow less characters for SCCP address book entries ...................................................................... allow less characters for SCCP address book entries Allowing a whole line of characters as address book name would be a lot, allowing 512 characters is completely ridiculous. That's more than this entire commit log message! 32 is plenty. All linking programs should automatically get the limitation in their VTY parsing without any changes. Configs with sccp-addr names > 31 chars will no longer work after this. Change-Id: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a --- M src/osmo_ss7_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/12/11112/2 -- To view, visit https://gerrit.osmocom.org/11112 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: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a Gerrit-Change-Number: 11112 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 gerrit-no-reply at lists.osmocom.org Thu Sep 27 12:35:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:35:03 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... Patch Set 2: the related ticket was a sysmocom internal one, so let me copy the remark here: " we have plenty of other timers already configurable in the osmocom universe, and we never suffix them with the unit. Rather, we document the unit in the help so that if you press tab, you will get some information as to what the unit is. I don't argue the existing behavior is better than your implemented one, but for the sake of consistency I would think it makes sense to align with the existing behavior. See for example the various tXXXX that are configurable in BSC an MSC. " I even tried to just copy the T... implementation from osmo-bsc, but it doesn't match. These timers here have names, not numbers. The T timers sometimes have really convoluted units that the user needs to familiarize with anyway, while all of these SCCP timers are a plain duration in "real time". A less important aspect: they are specified in ITU-T, not 3GPP. I see the consistency POV, and actually also considered making everything one unit. That would be seconds then. After contemplating back and forth I ended up with this implementation instead. If all are seconds, users then need to multiply/divide by 60 in the head for most timers, which are in the range of minutes. For the few shorter timers of about 10 seconds, I lose the ability to set sub-second timers. Not sure if it's relevant in practice, but for a value of a few seconds I thought it better to also allow higher resolution. But I definitely don't want to supply a timer of 11 minutes in milliseconds, UI wise. A timer as low as 20 minutes would already surpass a million. If we defined longer-specified timers as in-seconds, and shorter ones as in-milliseconds. If you really want that I can do it, but I don't like the inconsistency/non-readability between the individual sccp timers then. sccp-timer ias 300 sccp-timer iar 660 sccp-timer rel 10000 That really reads like "wtf". For me the best fixed unit choice then would be seconds for all timers, and losing the sub-second value range. I agree that consistency is good, yet it doesn't really match / help here IMHO. How about optional units? All default to seconds, but for convenience a 'm' or 'ms' can be added to spare the factor of 60 / to allow sub-second values? -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 12:35:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 12:38:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:38:29 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: sccp_scoc.c: fix timers definition units In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11110 ) Change subject: cosmetic: sccp_scoc.c: fix timers definition units ...................................................................... cosmetic: sccp_scoc.c: fix timers definition units The SCCP timer units are not what the comments say: Milliseconds are 1000 * seconds, not 100. Also, microseconds are 1000000 * seconds. Interestingly enough, MSEC_TO_US() tried to fix the wrong hundredth-seconds to microseconds by multiplying by 10, however, it should end up at a factor of a million, not a thousand, hence would result in wrong sub-second fractions. But, since none of the current timers use sub-second fractions, none of the timers are actually affected in practice. Hence this patch is merely cosmetic. Since all use of the timer constants is wrapped in MSEC_TO_US(), we can transparently fix all those values and their use: - define the constants in milliseconds (replace "100" with "1000"). - in MSEC_TO_US(), divide-and-mod by 1000. - in MSEC_TO_US(), actually calculate microseconds. BTW, I am about to make the timers VTY configurable, but before I get confused, I'd rather fix these units first. Change-Id: Ia6c893f734fbdc88873c4ef80f6cacf01ee7763a --- M src/sccp_scoc.c 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 3de986d..1057be0 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -65,18 +65,18 @@ #define SCU_MSGB_SIZE 1024 /* Appendix C.4 of Q.714 (all in milliseconds) */ -#define CONNECTION_TIMER ( 1 * 60 * 100) -#define TX_INACT_TIMER ( 7 * 60 * 100) /* RFC 3868 Ch. 8. */ -#define RX_INACT_TIMER (15 * 60 * 100) /* RFC 3868 Ch. 8. */ -#define RELEASE_TIMER ( 10 * 100) -#define RELEASE_REP_TIMER ( 10 * 100) -#define INT_TIMER ( 1 * 60 * 100) -#define GUARD_TIMER (23 * 60 * 100) -#define RESET_TIMER ( 10 * 100) +#define CONNECTION_TIMER ( 1 * 60 * 1000) +#define TX_INACT_TIMER ( 7 * 60 * 1000) /* RFC 3868 Ch. 8. */ +#define RX_INACT_TIMER (15 * 60 * 1000) /* RFC 3868 Ch. 8. */ +#define RELEASE_TIMER ( 10 * 1000) +#define RELEASE_REP_TIMER ( 10 * 1000) +#define INT_TIMER ( 1 * 60 * 1000) +#define GUARD_TIMER (23 * 60 * 1000) +#define RESET_TIMER ( 10 * 1000) /* convert from single value in milliseconds to comma-separated * "seconds, microseconds" format we use in osmocom/core/timers.h */ -#define MSEC_TO_S_US(x) (x/100), ((x%100)*10) +#define MSEC_TO_S_US(x) (x/1000), ((x%1000)*1000) /*********************************************************************** * SCCP connection table -- To view, visit https://gerrit.osmocom.org/11110 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: Ia6c893f734fbdc88873c4ef80f6cacf01ee7763a Gerrit-Change-Number: 11110 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 Thu Sep 27 12:38:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:38:29 +0000 Subject: Change in libosmo-sccp[master]: drop inaccurate comment from osmo_ss7_vty.c In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11111 ) Change subject: drop inaccurate comment from osmo_ss7_vty.c ...................................................................... drop inaccurate comment from osmo_ss7_vty.c Change-Id: I845f6661eaed361b5d4db88140efb8eb79b6b69d --- M src/osmo_ss7_vty.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index ea06b02..2f70bb6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -509,7 +509,6 @@ xs->cfg.local.port, VTY_NEWLINE); } -/* List all addressbook entries */ DEFUN(show_cs7_xua, show_cs7_xua_cmd, "show cs7 "XUA_VAR_STR" [<0-65534>]", SHOW_STR CS7_STR XUA_VAR_HELP_STR "Port Number") -- To view, visit https://gerrit.osmocom.org/11111 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: I845f6661eaed361b5d4db88140efb8eb79b6b69d Gerrit-Change-Number: 11111 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 Thu Sep 27 12:43:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 12:43:45 +0000 Subject: Change in libosmo-sccp[master]: vty: fix 'show asp' from within 'asp' node In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11113 ) Change subject: vty: fix 'show asp' from within 'asp' node ...................................................................... vty: fix 'show asp' from within 'asp' node When entering an 'cs7' / 'asp' node, and invoking 'do show cs7 i 0 asp', the ASP's FSM instance is not yet allocated. Hence attempting to print its status will result in a segfault. Spotted this while writing VTY tests that will follow shortly in another patch (I6a28684fa24d6e7de568623444297028eba2ab8c). Change-Id: I3ebf498492c6ba69a5dd1c9f36acdabfd6fbdfe1 --- M src/osmo_ss7_vty.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 2f70bb6..d109a0c 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -666,7 +666,8 @@ llist_for_each_entry(asp, &inst->asp_list, list) { vty_out(vty, "%-12s %-12s %-13s %-4s %-8u %-15s %-10s%s", - asp->cfg.name, "?", osmo_fsm_inst_state_name(asp->fi), + asp->cfg.name, "?", + asp->fi? osmo_fsm_inst_state_name(asp->fi) : "uninitialized", get_value_string(osmo_ss7_asp_protocol_vals, asp->cfg.proto), asp->cfg.remote.port, asp->cfg.remote.host, "", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/11113 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: I3ebf498492c6ba69a5dd1c9f36acdabfd6fbdfe1 Gerrit-Change-Number: 11113 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 Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: define SCCP_STR once 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/11115 to look at the new patch set (#2). Change subject: sccp_vty: define SCCP_STR once ...................................................................... sccp_vty: define SCCP_STR once Define SCCP_STR in sccp_internal.h, because I know that I want to also use it in osmo_ss7_vty.c. Fix "Signaling" to "Signalling" upon copying the old string. Change-Id: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 --- M src/sccp_internal.h M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 3 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/11115/2 -- To view, visit https://gerrit.osmocom.org/11115 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: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 Gerrit-Change-Number: 11115 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 Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: vty: tweak two printed strings 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/11116 to look at the new patch set (#2). Change subject: vty: tweak two printed strings ...................................................................... vty: tweak two printed strings Fix typo "to long". Say 'cs7 instance' instead of 'ss7 instance': we are interacting with a user on the telnet VTY, and that user is configuring a 'cs7 instance'. Especially a lowercase 'ss7' is potentially confusing ("is there an 'ss7' node?"). Changes show in ss7_asp_test.vty. Change-Id: Iebb976531576268d58338895a4baadbca6137b80 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/16/11116/2 -- To view, visit https://gerrit.osmocom.org/11116 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: Iebb976531576268d58338895a4baadbca6137b80 Gerrit-Change-Number: 11116 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 Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: vty: install 'show cs7' for sccp addrs on _ve nodes 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/11117 to look at the new patch set (#2). Change subject: vty: install 'show cs7' for sccp addrs on _ve nodes ...................................................................... vty: install 'show cs7' for sccp addrs on _ve nodes The 'show cs7 instance 0 sccp-addressbook' command should not be inside the 'cs7' node. That defies the point of naming the instance again, and it falls out of place of all the other 'show cs7' commands on the VIEW and ENABLE nodes. Drop the old command within the 'cs7' node without substitution or deprecation. At the same time, drop dash from 'show cs7 i 0 sccp-addressbook' There are various other show cs7 commands already defined in sccp_vty.c, which have 'sccp' as a separate string. Conform to that. Change-Id: I80e0bc0a91bcd3fb75372045db34592d2d663d41 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/17/11117/2 -- To view, visit https://gerrit.osmocom.org/11117 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: I80e0bc0a91bcd3fb75372045db34592d2d663d41 Gerrit-Change-Number: 11117 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 Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: allocate ss7->sccp in one common function 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/11118 to look at the new patch set (#2). Change subject: cosmetic: allocate ss7->sccp in one common function ...................................................................... cosmetic: allocate ss7->sccp in one common function Instead of allocating ss7->sccp in various places, unify that in one common function. We shouldn't spread the decision what to pass as priv pointer around everywhere. There is no functional difference. This is preparation for a patch where the sccp_instance gets allocated from the telnet VTY: I would prefer to hide all allocation details from that code; which also makes sense for the other callers of osmo_sccp_instance_create(). Change-Id: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c M src/sccp_user.c 3 files changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/11118/2 -- To view, visit https://gerrit.osmocom.org/11118 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: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 Gerrit-Change-Number: 11118 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 Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ 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/11120 to look at the new patch set (#3). Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... build: move include/{mtp,sccp} to include/osmocom/ Anywhere else in the Osmocom code base, we arrange headers in include/osmocom/foo/ and pass -I ${root_srcdir}/include/. This way including an osmocom header always has the format #include whether we are including from the local source tree or from $prefix. For some reason not clear to me, the mtp and sccp folders, even though they are being installed to $prefix/include/osmocom/, were kept *next* to the osmocom/ dir, instead of inside it. Fix that weird situation. The motivation is that I wanted to use a definition from sccp_types.h in a public-API header. That is impossible if it requires #include in a local build, but #include for any other source tree using libosmo-sccp. After this patch, both are identical and including works without quirks. (The other patch that needed this has changed in the meantime on and no longer needs this, but this still makes sense for future hacking.) The installed result does not change, since both mtp/*.h and sccp/*.h have always been installed to $prefix/include/osmocom/{mtp,sccp}/. This merely changes their position in the source tree. The most curious situation before this is that any patch #including might not get a notice that the header didn't exist, but might instead include an older system-installed file. Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 --- M configure.ac M include/Makefile.am M include/osmocom/Makefile.am R include/osmocom/mtp/Makefile.am R include/osmocom/mtp/mtp_level3.h R include/osmocom/mtp/mtp_pcap.h R include/osmocom/sccp/Makefile.am R include/osmocom/sccp/sccp.h R include/osmocom/sccp/sccp_types.h M src/mtp_pcap.c M src/sccp.c M src/sccp2sua.c M src/sccp_sclc.c M src/sccp_scoc.c M src/sccp_scrc.c M tests/mtp/mtp_parse_test.c M tests/sccp/sccp_test.c 17 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/20/11120/3 -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 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 Thu Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable 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/11119 to look at the new patch set (#3). Change subject: make SCCP timers configurable ...................................................................... make SCCP timers configurable The previous hardcoded SCCP timers may cause SCCP connection releases, if the peer is configured with far lower timers than libosmo-sccp. Testing with a specific SCCPlite MSC, I experienced an iar of just over three minutes, meaning that calls would be cut off by the MSC, since the osmo-bsc failed to send an Inactivity Timer message until seven minutes have passed. With this patch, SCCP timers are configurable by the user, with millisecond resolution (or by second or minute, for convenience). Define constant global default timers, and variable user-configurable timers with each osmo_sccp_instance. Add VTY UI to configure the timers. Users must call osmo_sccp_vty_init() to get the sccp-timer config nodes under the 'cs7' node. Show the new UI in ss7_asp_test.vty. Note that even though this function is not new at all, until recently, all of our SCCP users (osmo-bsc, osmo-msc, osmo-sgsn, osmo-hnbgw) failed to call osmo_sccp_vty_init(), and thus also missed out on the various 'show' commands defined in sccp_vty.c. In other words, to benefit from the timer configurability, the patches to call osmo_sccp_vty_init() must first be merged to the corresponding master branches. If a 'sccp-timer' config command occurs, the cs7 instance must allocate an SCCP instance in order to store the timer config. Do that by calling the recently added osmo_ss7_ensure_sccp() function. Hence remove the limitation that the SCCP instance must not be populated from the "simple" setup function. If we want to configure SCCP timers beforehand, there must be an SCCP instance for that, and there is no hard reason to require a NULL SCCP instance, besides the desire to prevent this function from being invoked twice. Change-Id: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_vty.c M src/sccp_internal.h M src/sccp_scoc.c M src/sccp_user.c M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 7 files changed, 385 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/19/11119/3 -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 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 Thu Sep 27 13:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 13:04:22 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: fix doc strings for show ... ssn, connections 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/11121 to look at the new patch set (#2). Change subject: sccp_vty: fix doc strings for show ... ssn,connections ...................................................................... sccp_vty: fix doc strings for show ... ssn,connections For 'show cs7 instance 0 ssn', fix doc string for 'ssn', and add missing one for the SSN arg. This fixes depending builds that see VTY test failures due to the missing doc string. For 'show cs7 instance 0 connectsion', fix doc string for 'connections'. Change-Id: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e --- M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/21/11121/2 -- To view, visit https://gerrit.osmocom.org/11121 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: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e Gerrit-Change-Number: 11121 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 Sep 27 14:08:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 14:08:59 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11120 ) Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... Patch Set 3: my apologies then, I though that moving it in the source tree would mean that it also gets installed into a different directory. However, I still think it's wrong to move those directories. the mtp and sccp headers are used differently than other osmocom libraries. libmtp and libsccp don't have "osmo" in their naming. Moving them would actually make them appear as standard libosmo*, which in reality they aren't. To me, the proper clean up would rather be to not use any of the sccp headers in libosmo-sigtran. I thought there even was a ticket related to that at some point. -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 14:08: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 Sep 27 14:10:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 14:10:04 +0000 Subject: Change in libosmo-sccp[master]: allow less characters for SCCP address book entries In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11112 ) Change subject: allow less characters for SCCP address book entries ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11112 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: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a Gerrit-Change-Number: 11112 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 14:10: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 Sep 27 14:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 14:15:04 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... Patch Set 3: just use seconds. I'm not sure where the desire for sub-second resolution comes from? I don't think this would ever at all make any sense on the SCCP layer. You are at a "layer 3/4" of a protocol that is used in global signaling. You can have any number of routed (mostly) terrestrial links. The latency/RTT is very likely in the hundreds of milli-seconds in many use cases. Hence I'd be surprised if the SCCP spec contained any sub-second-resolution timers, or even only any recommendation to set a timer to a fractional second. Please let me know if I'm missing something. Otherwise, I really don't see the point. And btw, the NS/libosmogb code also has timers which are named, and we also don't have different units there. So I really see no reason for all this complexity. We have *tons* of work to do rather such superficial cosmetics that just consume time - and then even have a discussion about it which consumes more time. Sorry. -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 14:15:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 14:27:07 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 27 Sep 2018 14:27:07 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 14:27: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 Sep 27 14:28:20 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 27 Sep 2018 14:28:20 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT 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/11060 to look at the new patch set (#8). Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (choosen) configuration bits with the assignment complete message. - Use the (highest of the) agreed codec rates in RSL channel activation. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 10 files changed, 183 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/8 -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 8 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 Thu Sep 27 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 27 Sep 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_#259?= In-Reply-To: <797455607.333.1537974607001.JavaMail.jenkins@jenkins.osmocom.org> References: <797455607.333.1537974607001.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <467969450.349.1538061006968.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 flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l 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 %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.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_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 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_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 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 -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_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_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 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_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 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_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_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 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 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_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_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.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 -o asn1p_class.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 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 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 Thu Sep 27 15:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 27 Sep 2018 15:49:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Revert "BSC_Tests: use consistant AMR S0-S15 bits" Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11129 Change subject: Revert "BSC_Tests: use consistant AMR S0-S15 bits" ...................................................................... Revert "BSC_Tests: use consistant AMR S0-S15 bits" The change depends on another change in osmo-bsc, which is not in master yet. Because of this TC_assignment_codec_amr_f and TC_assignment_codec_amr_h are currently failing. So lets revert this patch and re-submit it later. See also: osmo-bsc change I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 This reverts commit 7f5609ad3e65098cca3d79565a1aa80460c49bed. Change-Id: Ib16d14c723773ce67508c7e6028e594c15779506 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/11129/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4a34310..25df52d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1923,10 +1923,6 @@ testcase TC_assignment_codec_amr_f() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; - - /* Note: This setups the codec configuration. The parameter payload in - * mr_conf must be consistant with the parameter codecElements in pars - * and also must match the amr-config in osmo-bsc.cfg! */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1934,14 +1930,11 @@ } }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; - pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; - pars.expect_mr_conf_ie := mr_conf; - f_init(1, true); f_sleep(1.0); + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); + pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1949,8 +1942,6 @@ testcase TC_assignment_codec_amr_h() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; - - /* See note above */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1958,14 +1949,11 @@ } }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; - pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; - pars.expect_mr_conf_ie := mr_conf; - f_init(1, true); f_sleep(1.0); + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/11129 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: Ib16d14c723773ce67508c7e6028e594c15779506 Gerrit-Change-Number: 11129 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 15:52:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:52:51 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: fix doc strings for show ... ssn, connections 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/11121 to look at the new patch set (#3). Change subject: sccp_vty: fix doc strings for show ... ssn,connections ...................................................................... sccp_vty: fix doc strings for show ... ssn,connections For 'show cs7 instance 0 ssn', fix doc string for 'ssn', and add missing one for the SSN arg. This fixes depending builds that see VTY test failures due to the missing doc string. For 'show cs7 instance 0 connectsion', fix doc string for 'connections'. Change-Id: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e --- M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/21/11121/3 -- To view, visit https://gerrit.osmocom.org/11121 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: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e Gerrit-Change-Number: 11121 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 Thu Sep 27 15:52:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:52:51 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable 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/11119 to look at the new patch set (#4). Change subject: make SCCP timers configurable ...................................................................... make SCCP timers configurable The previous hardcoded SCCP timers may cause SCCP connection releases, if the peer is configured with far lower timers than libosmo-sccp. Testing with a specific SCCPlite MSC, I experienced an iar of just over three minutes, meaning that calls would be cut off by the MSC, since the osmo-bsc failed to send an Inactivity Timer message until seven minutes have passed. With this patch, SCCP timers are configurable by the user, with millisecond resolution (or by second or minute, for convenience). Define constant global default timers, and variable user-configurable timers with each osmo_sccp_instance. Add VTY UI to configure the timers. Users must call osmo_sccp_vty_init() to get the sccp-timer config nodes under the 'cs7' node. Show the new UI in ss7_asp_test.vty. Note that even though this function is not new at all, until recently, all of our SCCP users (osmo-bsc, osmo-msc, osmo-sgsn, osmo-hnbgw) failed to call osmo_sccp_vty_init(), and thus also missed out on the various 'show' commands defined in sccp_vty.c. In other words, to benefit from the timer configurability, the patches to call osmo_sccp_vty_init() must first be merged to the corresponding master branches. If a 'sccp-timer' config command occurs, the cs7 instance must allocate an SCCP instance in order to store the timer config. Do that by calling the recently added osmo_ss7_ensure_sccp() function. Hence remove the limitation that the SCCP instance must not be populated from the "simple" setup function. If we want to configure SCCP timers beforehand, there must be an SCCP instance for that, and there is no hard reason to require a NULL SCCP instance, besides the desire to prevent this function from being invoked twice. Change-Id: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 --- M src/osmo_ss7_vty.c M src/sccp_internal.h M src/sccp_scoc.c M src/sccp_user.c M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 6 files changed, 327 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/19/11119/4 -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 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 Thu Sep 27 15:52:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:52:52 +0000 Subject: Change in libosmo-sccp[master]: vty: SCCP timers: add optional units Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11130 Change subject: vty: SCCP timers: add optional units ...................................................................... vty: SCCP timers: add optional units Add VTY UI to optionally configure SCCP timers in millisecond unit, allowing for less-than-a-second resolution, and in minute unit, allowing for convenience to cut short the factor-of-60 calculations when thinking in minutes. Also write back the config in the largest possible unit that doesn't lose timer value precision. Change-Id: I020d5dab19bc67e8444ed548db15b2a4d8871a9c --- M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 109 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/30/11130/1 diff --git a/src/sccp_vty.c b/src/sccp_vty.c index 46afb49..b251f58 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -142,19 +142,32 @@ } /* sccp-timer <1-999999> - * (cmdstr and doc are dynamically generated from osmo_sccp_timer_names.) */ + * (cmdstr and doc are dynamically generated from osmo_sccp_timer_names.) + * The VTY API does not allow passing optional choice args like [(a|b|c)], so there is a separate command + * for adding optional unit indicators. */ DEFUN(sccp_timer, sccp_timer_cmd, NULL, NULL) { struct osmo_ss7_instance *ss7 = vty->index; enum osmo_sccp_timer timer = get_string_value(osmo_sccp_timer_names, argv[0]); - struct osmo_sccp_timer_val set_val = { .s = atoi(argv[1]) }; + struct osmo_sccp_timer_val set_val = {}; + int val = atoi(argv[1]); + const char *unit = argc > 2? argv[2] : "s"; if (timer < 0 || timer >= OSMO_SCCP_TIMERS_COUNT) { vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } + if (!strcmp(unit, "m")) + set_val.s = val * 60; + else if (!strcmp(unit, "s")) + set_val.s = val; + else if (!strcmp(unit, "ms")) { + set_val.s = val / 1000; + set_val.us = (val % 1000) * 1000; + } + osmo_ss7_ensure_sccp(ss7); if (!ss7->sccp) { vty_out(vty, "%% Error: cannot instantiate SCCP instance%s", VTY_NEWLINE); @@ -165,15 +178,25 @@ return CMD_SUCCESS; } +/* sccp-timer <1-999999> (m|s|ms) + * (cmdstr and doc are dynamically generated from osmo_sccp_timer_names.) */ +ALIAS(sccp_timer, sccp_timer_unit_cmd, NULL, NULL) + static const char *osmo_sccp_timer_val_name(const struct osmo_sccp_timer_val *val) { static char buf[16]; - snprintf(buf, sizeof(buf), "%u", val->s); + if (val->us) { + uint32_t ms = val->us / 1000 + val->s * 1000; + snprintf(buf, sizeof(buf), "%u ms", ms); + } else if (val->s % 60) + snprintf(buf, sizeof(buf), "%u", val->s); + else + snprintf(buf, sizeof(buf), "%u m", val->s / 60); return buf; } -static void gen_sccp_timer_cmd_strs(struct cmd_element *cmd) +static void gen_sccp_timer_cmd_strs(struct cmd_element *cmd, bool with_units) { int i; char *cmd_str = NULL; @@ -200,11 +223,21 @@ osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %s)\n", osmo_sccp_timer_description(timer), osmo_sccp_timer_val_name(def)); + + } osmo_talloc_asprintf(tall_vty_ctx, cmd_str, ") <1-999999>"); osmo_talloc_asprintf(tall_vty_ctx, doc_str, - "Timer value, in seconds\n"); + "Timer value, in seconds unless a different unit keyword follows\n"); + + if (with_units) { + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, " (m|s|ms)"); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Timer value unit: supply value in minutes instead of seconds\n" + "Timer value unit: supply value in seconds, which is also the default unit\n" + "Timer value unit: supply value in milliseconds instead of seconds\n"); + } cmd->string = cmd_str; cmd->doc = doc_str; @@ -260,6 +293,8 @@ install_element_ve(&show_sccp_connections_cmd); install_element_ve(&show_sccp_timers_cmd); - gen_sccp_timer_cmd_strs(&sccp_timer_cmd); + gen_sccp_timer_cmd_strs(&sccp_timer_cmd, false); + gen_sccp_timer_cmd_strs(&sccp_timer_unit_cmd, true); install_element(L_CS7_NODE, &sccp_timer_cmd); + install_element(L_CS7_NODE, &sccp_timer_unit_cmd); } diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index cb8dc85..d9b1d97 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -83,6 +83,7 @@ sccp-address NAME no sccp-address NAME sccp-timer (conn_est|ias|iar|rel|repeat_rel|int|guard|reset|reassembly) <1-999999> + sccp-timer (conn_est|ias|iar|rel|repeat_rel|int|guard|reset|reassembly) <1-999999> (m|s|ms) ss7_asp_vty_test(config-cs7)# ? ... @@ -367,31 +368,31 @@ ss7_asp_vty_test(config-cs7)# show running-config ... !sccp-timer -ss7_asp_vty_test(config-cs7)# sccp-timer ias 5 +ss7_asp_vty_test(config-cs7)# sccp-timer ias 5 ms ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers -sccp-timer conn_est 60 -sccp-timer ias 5 -sccp-timer iar 900 +sccp-timer conn_est 1 m +sccp-timer ias 5 ms +sccp-timer iar 15 m sccp-timer rel 10 sccp-timer repeat_rel 10 -sccp-timer int 60 -sccp-timer guard 1380 +sccp-timer int 1 m +sccp-timer guard 23 m sccp-timer reset 10 sccp-timer reassembly 10 ss7_asp_vty_test(config-cs7)# show running-config ... !sccp-timer - sccp-timer ias 5 + sccp-timer ias 5 ms ... !sccp-timer -ss7_asp_vty_test(config-cs7)# sccp-timer ias 420 +ss7_asp_vty_test(config-cs7)# sccp-timer ias 7 m ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers -sccp-timer conn_est 60 -sccp-timer ias 420 -sccp-timer iar 900 +sccp-timer conn_est 1 m +sccp-timer ias 7 m +sccp-timer iar 15 m sccp-timer rel 10 sccp-timer repeat_rel 10 -sccp-timer int 60 -sccp-timer guard 1380 +sccp-timer int 1 m +sccp-timer guard 23 m sccp-timer reset 10 sccp-timer reassembly 10 ss7_asp_vty_test(config-cs7)# show running-config @@ -401,15 +402,63 @@ sccp-timer Configure SCCP timer values, see ITU-T Q.714 ss7_asp_vty_test(config-cs7)# sccp-timer ? - conn_est Waiting for connection confirm message, 1 to 2 minutes (default: 60) - ias Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes (default: 420) - iar Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes (default: 900) + conn_est Waiting for connection confirm message, 1 to 2 minutes (default: 1 m) + ias Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes (default: 7 m) + iar Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes (default: 15 m) rel Waiting for release complete message, 10 to 20 seconds (default: 10) repeat_rel Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds (default: 10) - int Waiting for release complete message; or to release connection resources, freeze the LRN and alert a maintenance function after the initial expiry, extending to 1 minute (default: 60) - guard Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes (default: 1380) + int Waiting for release complete message; or to release connection resources, freeze the LRN and alert a maintenance function after the initial expiry, extending to 1 minute (default: 1 m) + guard Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes (default: 23 m) reset Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds (default: 10) reassembly Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds (default: 10) ss7_asp_vty_test(config-cs7)# sccp-timer conn_est ? - <1-999999> Timer value, in seconds + <1-999999> Timer value, in seconds unless a different unit keyword follows + +ss7_asp_vty_test(config-cs7)# sccp-timer conn_est 1 ? + m Timer value unit: supply value in minutes instead of seconds + s Timer value unit: supply value in seconds, which is also the default unit + ms Timer value unit: supply value in milliseconds instead of seconds + + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 1 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 1 ms +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 1000 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 1 +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 60000 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 1 m +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 60500 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 60500 ms +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 65000 ms +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 65 +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 65 +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 65 +... + +ss7_asp_vty_test(config-cs7)# sccp-timer iar 180 +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +... +sccp-timer iar 3 m +... -- To view, visit https://gerrit.osmocom.org/11130 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: I020d5dab19bc67e8444ed548db15b2a4d8871a9c Gerrit-Change-Number: 11130 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 15:54:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:54:11 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable 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/11119 to look at the new patch set (#5). Change subject: make SCCP timers configurable ...................................................................... make SCCP timers configurable The previous hardcoded SCCP timers may cause SCCP connection releases, if the peer is configured with far lower timers than libosmo-sccp. Testing with a specific SCCPlite MSC, I experienced an iar of just over three minutes, meaning that calls would be cut off by the MSC, since the osmo-bsc failed to send an Inactivity Timer message until seven minutes have passed. With this patch, SCCP timers are configurable by the user. Define constant global default timers, and variable user-configurable timers with each osmo_sccp_instance. Add VTY UI to configure the timers. Users must call osmo_sccp_vty_init() to get the sccp-timer config nodes under the 'cs7' node. Show the new UI in ss7_asp_test.vty. Note that even though this function is not new at all, until recently, all of our SCCP users (osmo-bsc, osmo-msc, osmo-sgsn, osmo-hnbgw) failed to call osmo_sccp_vty_init(), and thus also missed out on the various 'show' commands defined in sccp_vty.c. In other words, to benefit from the timer configurability, the patches to call osmo_sccp_vty_init() must first be merged to the corresponding master branches. If a 'sccp-timer' config command occurs, the cs7 instance must allocate an SCCP instance in order to store the timer config. Do that by calling the recently added osmo_ss7_ensure_sccp() function. Hence remove the limitation that the SCCP instance must not be populated from the "simple" setup function. If we want to configure SCCP timers beforehand, there must be an SCCP instance for that, and there is no hard reason to require a NULL SCCP instance, besides the desire to prevent this function from being invoked twice. Change-Id: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 --- M src/osmo_ss7_vty.c M src/sccp_internal.h M src/sccp_scoc.c M src/sccp_user.c M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 6 files changed, 327 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/19/11119/5 -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 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 Thu Sep 27 15:54:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:54:11 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ 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/11120 to look at the new patch set (#5). Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... build: move include/{mtp,sccp} to include/osmocom/ Anywhere else in the Osmocom code base, we arrange headers in include/osmocom/foo/ and pass -I ${root_srcdir}/include/. This way including an osmocom header always has the format #include whether we are including from the local source tree or from $prefix. For some reason not clear to me, the mtp and sccp folders, even though they are being installed to $prefix/include/osmocom/, were kept *next* to the osmocom/ dir, instead of inside it. Fix that weird situation. The motivation is that I wanted to use a definition from sccp_types.h in a public-API header. That is impossible if it requires #include in a local build, but #include for any other source tree using libosmo-sccp. After this patch, both are identical and including works without quirks. (The other patch that needed this has changed in the meantime on and no longer needs this, but this still makes sense for future hacking.) The installed result does not change, since both mtp/*.h and sccp/*.h have always been installed to $prefix/include/osmocom/{mtp,sccp}/. This merely changes their position in the source tree. The most curious situation before this is that any patch #including might not get a notice that the header didn't exist, but might instead include an older system-installed file. Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 --- M configure.ac M include/Makefile.am M include/osmocom/Makefile.am R include/osmocom/mtp/Makefile.am R include/osmocom/mtp/mtp_level3.h R include/osmocom/mtp/mtp_pcap.h R include/osmocom/sccp/Makefile.am R include/osmocom/sccp/sccp.h R include/osmocom/sccp/sccp_types.h M src/mtp_pcap.c M src/sccp.c M src/sccp2sua.c M src/sccp_sclc.c M src/sccp_scoc.c M src/sccp_scrc.c M tests/mtp/mtp_parse_test.c M tests/sccp/sccp_test.c 17 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/20/11120/5 -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 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 Thu Sep 27 15:54:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:54:11 +0000 Subject: Change in libosmo-sccp[master]: vty: SCCP timers: add optional units In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11130 ) Change subject: vty: SCCP timers: add optional units ...................................................................... vty: SCCP timers: add optional units Add VTY UI to optionally configure SCCP timers in millisecond unit, allowing for less-than-a-second resolution, and in minute unit, allowing for convenience to cut short the factor-of-60 calculations when thinking in minutes. Also write back the config in the largest possible unit that doesn't lose timer value precision. Change-Id: I020d5dab19bc67e8444ed548db15b2a4d8871a9c --- M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 109 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/30/11130/2 -- To view, visit https://gerrit.osmocom.org/11130 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: I020d5dab19bc67e8444ed548db15b2a4d8871a9c Gerrit-Change-Number: 11130 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 15:56:33 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 27 Sep 2018 15:56:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11131 Change subject: BSC_Tests: use consistant AMR S0-S15 bits ...................................................................... BSC_Tests: use consistant AMR S0-S15 bits At the moment we use the default S0-S15 bits for the AMR config, regardless what RSL_IE_Body mr_conf or osmo-bsc.cfg sets. - Make sure consistant S0-S15 bits are used for AMR related tests. This is a re-submit of change I794e6d4fe8abc67337428cbe0bcc8802fae37a6e, which had to be reverted because the depending patch in osmo-bsc is not yet merged into master. This caused TC_assignment_codec_amr_f and TC_assignment_codec_amr_h to fail. Change-Id: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Depends: osmo-bsc: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/11131/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 25df52d..4a34310 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1923,6 +1923,10 @@ testcase TC_assignment_codec_amr_f() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* Note: This setups the codec configuration. The parameter payload in + * mr_conf must be consistant with the parameter codecElements in pars + * and also must match the amr-config in osmo-bsc.cfg! */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1930,11 +1934,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1942,6 +1949,8 @@ testcase TC_assignment_codec_amr_h() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* See note above */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1949,11 +1958,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/11131 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: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Gerrit-Change-Number: 11131 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 15:58:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 15:58:02 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... Patch Set 5: now this patch is just seconds. The optional units are added in a following patch, because frankly I find 1380 a really insane setting for 23 minutes. They are still optional, I guess that's an ok compromise...? anyway, the decision is now separate from getting things working, FWIW the other patch can sit there forever if we don't care about UI enough (G#11130) -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 15:58:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 16:01:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:01:28 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11120 ) Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... Patch Set 5: This patch is now completely optional. I thought I needed it, but that was just because an accidental leftover #include in that other patch. I'm still confused though why those headers get installed into $prefix/include/osmocom/*/ -- either they are osmo libraries and get installed and sit at the right place in both $prefix and source tree, or they are internal headers and sit wherever they like, but also don't get installed. IMHO it's either of the two. -- To view, visit https://gerrit.osmocom.org/11120 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: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 16:01:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 16:02:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:02:21 +0000 Subject: Change in libosmo-sccp[master]: allow less characters for SCCP address book entries In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11112 ) Change subject: allow less characters for SCCP address book entries ...................................................................... allow less characters for SCCP address book entries Allowing a whole line of characters as address book name would be a lot, allowing 512 characters is completely ridiculous. That's more than this entire commit log message! 32 is plenty. All linking programs should automatically get the limitation in their VTY parsing without any changes. Configs with sccp-addr names > 31 chars will no longer work after this. Change-Id: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a --- M src/osmo_ss7_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index d109a0c..295fc20 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1019,7 +1019,7 @@ struct llist_head list; struct llist_head list_global; struct osmo_ss7_instance *inst; - char name[512]; + char name[32]; struct osmo_sccp_addr addr; }; -- To view, visit https://gerrit.osmocom.org/11112 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: I3ecf83d620e46f7bf9857fc60a93d4e240ee3b8a Gerrit-Change-Number: 11112 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 Thu Sep 27 16:02:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:02:21 +0000 Subject: Change in libosmo-sccp[master]: add tests/vty: VTY UI transcript testing In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11114 ) Change subject: add tests/vty: VTY UI transcript testing ...................................................................... add tests/vty: VTY UI transcript testing Add ss7_asp_vty_test, a shim test program with the sole purpose of exposing the cs7 VTY nodes. Add ss7_asp_test.vty, transcript for verifying VTY nodes using above program. Add --enable-external-tests to configure. Run jenkins.sh with --enable-external-tests. Change-Id: I6a28684fa24d6e7de568623444297028eba2ab8c --- M configure.ac M contrib/jenkins.sh M tests/Makefile.am A tests/vty/Makefile.am A tests/vty/ss7_asp_test.vty A tests/vty/ss7_asp_vty_test.c 6 files changed, 621 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index af64bc0..7dfb266 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,21 @@ [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AM_PATH_PYTHON + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + 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]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -133,6 +148,7 @@ tests/m2ua/Makefile tests/xua/Makefile tests/ss7/Makefile + tests/vty/Makefile examples/Makefile stp/Makefile doc/Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d15cebe..a417a9e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,9 +36,10 @@ set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror +./configure --enable-sanitize --enable-werror --enable-external-tests $MAKE $PARALLEL_MAKE -$MAKE distcheck \ +DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ + $MAKE distcheck \ || cat-testlogs.sh osmo-clean-workspace.sh diff --git a/tests/Makefile.am b/tests/Makefile.am index 70e8a00..34bba67 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = xua sccp mtp m2ua ss7 +SUBDIRS = xua sccp mtp m2ua ss7 vty # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am new file mode 100644 index 0000000..28e9dc2 --- /dev/null +++ b/tests/vty/Makefile.am @@ -0,0 +1,32 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) + +AM_LDFLAGS = -static +LDADD = $(top_builddir)/src/libosmo-sigtran.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +EXTRA_DIST = ss7_asp_test.vty + +noinst_PROGRAMS = ss7_asp_vty_test + +ss7_asp_vty_test_SOURCES = ss7_asp_vty_test.c + +if ENABLE_EXT_TESTS +ext-tests: + $(MAKE) vty-test +else +ext-tests: + echo "Not running python-based external tests (determined at configure-time)" +endif + +# To update the VTY script from current application behavior, +# pass -u to osmo_verify_transcript_vty.py by doing: +# make vty-test U=-u +vty-test: ss7_asp_vty_test + osmo_verify_transcript_vty.py -v \ + -p 42043 \ + -r "$(builddir)/ss7_asp_vty_test" \ + $(U) $(srcdir)/ss7_asp_*.vty + +check-local: + $(MAKE) $(AM_MAKEFLAGS) ext-tests diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty new file mode 100644 index 0000000..fc46cff --- /dev/null +++ b/tests/vty/ss7_asp_test.vty @@ -0,0 +1,350 @@ +ss7_asp_vty_test> list +... !show cs7 + show cs7 instance <0-15> users + show cs7 (sua|m3ua|ipa) [<0-65534>] + show cs7 instance <0-15> asp + show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp users + show cs7 instance <0-15> sccp ssn <0-65535> + show cs7 instance <0-15> sccp connections +... !show cs7 + +ss7_asp_vty_test> enable +ss7_asp_vty_test# list +... !show cs7 + show cs7 instance <0-15> users + show cs7 (sua|m3ua|ipa) [<0-65534>] + show cs7 instance <0-15> asp + show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp users + show cs7 instance <0-15> sccp ssn <0-65535> + show cs7 instance <0-15> sccp connections +... !show cs7 + +ss7_asp_vty_test# show ? +... + cs7 ITU-T Signaling System 7 +... + +ss7_asp_vty_test# show cs7 ? + instance An instance of the SS7 stack + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +ss7_asp_vty_test# show cs7 m3ua ? + [<0-65534>] Port Number + +ss7_asp_vty_test# show cs7 instance ? + <0-15> An instance of the SS7 stack + +ss7_asp_vty_test# show cs7 instance 0 ? + users User Table + asp Application Server Process (ASP) + as Application Server (AS) + sccp Signaling Connection Control Part + +ss7_asp_vty_test# show cs7 instance 0 as ? + active Display all active ASs + all Display all ASs (default) + m3ua Display all m3ua ASs + sua Display all SUA ASs + +ss7_asp_vty_test# show cs7 instance 0 sccp ? + users Show List of SCCP Users registered + ssn Show List of SCCP Users registered + connections Show List of SCCP Users registered + +ss7_asp_vty_test# show cs7 instance 0 sccp ssn ? + <0-65535> + +ss7_asp_vty_test# configure terminal +ss7_asp_vty_test(config)# cs7 instance 0 + +ss7_asp_vty_test(config-cs7)# list +... + description .TEXT + network-indicator (international | national | reserved | spare) + point-code POINT_CODE + point-code format <1-24> [<1-23>] [<1-22>] + point-code format default + point-code delimiter (default|dash) + xua rkm routing-key-allocation (static-only|dynamic-permitted) + asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) + no asp NAME + as NAME (sua|m3ua|ipa) + no as NAME + show cs7 instance <0-15> sccp-addressbook + sccp-address NAME + no sccp-address NAME + +ss7_asp_vty_test(config-cs7)# ? +... + description Save human-readable description of the object + network-indicator Configure the Network Indicator + point-code Configure the local Point Code + xua SIGTRAN xxxUA related + asp Configure Application Server Process + no Negate a command or set its defaults + as Configure an Application Server + sccp-address Create/Modify an SCCP addressbook entry + +ss7_asp_vty_test(config-cs7)# description ? + TEXT Text until the end of the line + +ss7_asp_vty_test(config-cs7)# network-indicator ? + international International Network + national National Network + reserved Reserved Network + spare Spare Network + +ss7_asp_vty_test(config-cs7)# point-code ? + POINT_CODE Point Code + format Configure Point Code Format + delimiter Configure Point Code Delimiter + +ss7_asp_vty_test(config-cs7)# point-code format ? + <1-24> Length of first PC component + default Default Point Code Format (3.8.3) +ss7_asp_vty_test(config-cs7)# point-code format 1 ? + [<1-23>] Length of second PC component +ss7_asp_vty_test(config-cs7)# point-code format 1 1 ? + [<1-22>] Length of third PC component + +ss7_asp_vty_test(config-cs7)# point-code delimiter ? + default Use dot as delimiter + dash User dash as delimiter + +ss7_asp_vty_test(config-cs7)# xua ? + rkm Routing Key Management +ss7_asp_vty_test(config-cs7)# xua rkm ? + routing-key-allocation Routing Key Management Allocation Policy +ss7_asp_vty_test(config-cs7)# xua rkm routing-key-allocation ? + static-only Only static (pre-confgured) Routing Keys permitted + dynamic-permitted Dynamically allocate Routing Keys for what ASPs request + +ss7_asp_vty_test(config-cs7)# asp ? + NAME Name of ASP +ss7_asp_vty_test(config-cs7)# asp foo ? + <0-65535> Remote SCTP port number +ss7_asp_vty_test(config-cs7)# asp foo 0 ? + <0-65535> Local SCTP port number +ss7_asp_vty_test(config-cs7)# asp foo 0 0 ? + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +ss7_asp_vty_test(config-cs7)# as ? + NAME Name of the Application Server +ss7_asp_vty_test(config-cs7)# as foo ? + sua SCCP User Adaptation + m3ua MTP3 User Adaptation + ipa IPA Multiplex (SCCP Lite) + +ss7_asp_vty_test(config-cs7)# sccp-address ? + NAME Name of the SCCP Address + +ss7_asp_vty_test(config-cs7)# no ? + asp Disable Application Server Process + as Disable Application Server + sccp-address Delete an SCCP addressbook entry +ss7_asp_vty_test(config-cs7)# no asp ? + NAME Name of ASP +ss7_asp_vty_test(config-cs7)# no as ? + NAME Name of AS +ss7_asp_vty_test(config-cs7)# no sccp-address ? + NAME Name of the SCCP Address + +ss7_asp_vty_test(config-cs7)# sccp-address foo +ss7_asp_vty_test(config-cs7-sccpaddr)# list +... + no point-code + no subsystem-number + no global-title + routing-indicator (GT|PC|IP) + point-code POINT_CODE + subsystem-number <0-4294967295> + global-title +ss7_asp_vty_test(config-cs7-sccpaddr)# ? +... + no Negate a command or set its defaults + routing-indicator Add Routing Indicator + point-code Add point-code Number + subsystem-number Add Subsystem Number + global-title Add/Modify Global Title + +ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 + +ss7_asp_vty_test(config-cs7-sccpaddr)# do show cs7 instance 0 sccp addressbook +% Unknown command. +ss7_asp_vty_test(config-cs7-sccpaddr)# exit + +ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar +Error: SCCP address name to long: 'foobarfoobarfoobarfoobarfoobarfoobar' +% Command incomplete. + +ss7_asp_vty_test(config-cs7)# exit +ss7_asp_vty_test(config)# cs7 instance 1 +ss7_asp_vty_test(config-cs7)# sccp-address foo +Error: SCCP address name already used in ss7 instance 0: 'foo' +% Command incomplete. +ss7_asp_vty_test(config-cs7)# sccp-address bar +ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 +ss7_asp_vty_test(config-cs7-sccpaddr)# exit +ss7_asp_vty_test(config-cs7)# exit +ss7_asp_vty_test(config)# no cs7 instance 1 +% Unknown command. + +ss7_asp_vty_test(config)# cs7 instance 0 + +ss7_asp_vty_test(config-cs7)# asp my-asp 12345 54321 m3ua +ss7_asp_vty_test(config-cs7-asp)# list +... + description .TEXT + remote-ip A.B.C.D + local-ip A.B.C.D + qos-class <0-255> + block + shutdown + +ss7_asp_vty_test(config-cs7-asp)# ? +... + description Save human-readable description of the object + remote-ip Specify Remote IP Address of ASP + local-ip Specify Local IP Address from which to contact ASP + qos-class Specify QoS Class of ASP + block Allows a SCTP Association with ASP, but doesn't let it become active + shutdown Terminates SCTP association; New associations will be rejected + +ss7_asp_vty_test(config-cs7-asp)# remote-ip 127.0.0.200 +ss7_asp_vty_test(config-cs7-asp)# local-ip 127.0.0.100 +ss7_asp_vty_test(config-cs7-asp)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? uninitialized m3ua 12345 127.0.0.200 +ss7_asp_vty_test(config-cs7-asp)# exit + +ss7_asp_vty_test(config-cs7)# as my-ass m3ua +ss7_asp_vty_test(config-cs7-as)# list +... + description .TEXT + asp NAME + no asp NAME + traffic-mode (broadcast | loadshare | roundrobin | override) + recovery-timeout <1-2000> + qos-class <0-255> + routing-key RCONTEXT DPC + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) + routing-key RCONTEXT DPC ssn SSN + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN + point-code override dpc PC + +ss7_asp_vty_test(config-cs7-as)# ? +... + description Save human-readable description of the object + asp Specify that a given ASP is part of this AS + no Negate a command or set its defaults + traffic-mode Specifies traffic mode of operation of the ASP within the AS + recovery-timeout Specifies the recovery timeout value in milliseconds + qos-class Specity QoS Class of AS + routing-key Define a routing key + point-code Point Code Specific Features + +ss7_asp_vty_test(config-cs7-as)# no ? + asp Specify ASP to be removed from this AS + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 0.0.0 + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as active + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 0.0.0 + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as sua + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as m3ua + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 0.0.0 + +ss7_asp_vty_test(config-cs7-as)# asp my-asp +ss7_asp_vty_test(config-cs7-as)# routing-key 0 3.2.1 + +ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? ASP_DOWN m3ua 12345 127.0.0.200 + +ss7_asp_vty_test(config-cs7-as)# exit +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? ASP_DOWN m3ua 12345 127.0.0.200 + +ss7_asp_vty_test(config-cs7)# exit + + +ss7_asp_vty_test(config)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- +my-asp ? ASP_DOWN m3ua 12345 127.0.0.200 + +ss7_asp_vty_test(config)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 3.2.1 + + + +ss7_asp_vty_test(config)# show running-config +... +cs7 instance 1 + sccp-address bar + routing-indicator PC + point-code 1.2.3 +cs7 instance 0 + asp my-asp 12345 54321 m3ua + local-ip 127.0.0.100 + remote-ip 127.0.0.200 + as my-ass m3ua + asp my-asp + routing-key 0 3.2.1 + sccp-address foo + routing-indicator PC + point-code 1.2.3 +end + +ss7_asp_vty_test(config)# do show cs7 instance 0 users + +ss7_asp_vty_test(config)# do show cs7 m3ua + +ss7_asp_vty_test(config)# cs7 instance 0 +ss7_asp_vty_test(config-cs7)# no asp unknown-asp +No ASP named 'unknown-asp' found + +ss7_asp_vty_test(config-cs7)# no asp my-asp + +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp + Effect Primary +ASP Name AS Name State Type Rmt Port Remote IP Addr SCTP +------------ ------------ ------------- ---- -------- --------------- ---------- + +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic +AS Name State Context Dpc Si Opc Ssn Min Max +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- +my-ass AS_DOWN 0 3.2.1 diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c new file mode 100644 index 0000000..6918df4 --- /dev/null +++ b/tests/vty/ss7_asp_vty_test.c @@ -0,0 +1,219 @@ +/* test program with a vty interface to test VTY node behavior */ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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. + * + */ + +#define _GNU_SOURCE +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include + +void *root_ctx = NULL; + +const struct log_info log_info = { +}; + +static void print_help() +{ + printf( "options:\n" + " -h --help this text\n" + " -d --debug MASK Enable debugging (e.g. -d DRSL:DOML:DLAPDM)\n" + " -D --daemonize For the process into a background daemon\n" + " -c --config-file Specify the filename of the config file\n" + " -s --disable-color Don't use colors in stderr log output\n" + " -T --timestamp Prefix every log line with a timestamp\n" + " -V --version Print version information and exit\n" + " -e --log-level Set a global log-level\n" + ); +} + +static struct { + const char *config_file; + int daemonize; +} cmdline_config = {}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_idx = 0, c; + static const struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "debug", 1, 0, 'd' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "disable-color", 0, 0, 's' }, + { "timestamp", 0, 0, 'T' }, + { "version", 0, 0, 'V' }, + { "log-level", 1, 0, 'e' }, + {} + }; + + c = getopt_long(argc, argv, "hc:d:Dc:sTVe:", + long_options, &option_idx); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_config.daemonize = 1; + break; + case 'c': + cmdline_config.config_file = optarg; + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + } + } +} + +static int quit = 0; + +static void signal_handler(int signal) +{ + fprintf(stdout, "signal %u received\n", signal); + + switch (signal) { + case SIGINT: + case SIGTERM: + quit++; + break; + case SIGABRT: + osmo_generate_backtrace(); + /* in case of abort, we want to obtain a talloc report + * and then return to the caller, who will abort the process */ + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(root_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static struct vty_app_info vty_info = { + .name = "ss7_asp_vty_test", + .version = PACKAGE_VERSION, + .go_parent_cb = osmo_ss7_vty_go_parent, +}; + +int main(int argc, char **argv) +{ + int rc; + + root_ctx = talloc_named_const(NULL, 0, "ss7_asp_vty_test"); + + vty_info.tall_ctx = root_ctx; + vty_init(&vty_info); + + osmo_init_logging2(root_ctx, &log_info); + logging_vty_add_cmds(&log_info); + + osmo_ss7_init(); + osmo_ss7_vty_init_asp(root_ctx); + osmo_sccp_vty_init(); + + handle_options(argc, argv); + + osmo_talloc_vty_add_cmds(); + + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + + if (cmdline_config.config_file) { + rc = vty_read_config_file(cmdline_config.config_file, NULL); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + cmdline_config.config_file); + return 1; + } + } + + rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42043); + if (rc < 0) + return 2; + + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + + if (cmdline_config.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + return 6; + } + } + + while (!quit) { + log_reset_context(); + osmo_select_main(0); + } + + log_fini(); + + talloc_free(root_ctx); + talloc_free(tall_vty_ctx); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/11114 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: I6a28684fa24d6e7de568623444297028eba2ab8c Gerrit-Change-Number: 11114 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 Sep 27 16:02:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:02:23 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: define SCCP_STR once In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11115 ) Change subject: sccp_vty: define SCCP_STR once ...................................................................... sccp_vty: define SCCP_STR once Define SCCP_STR in sccp_internal.h, because I know that I want to also use it in osmo_ss7_vty.c. Fix "Signaling" to "Signalling" upon copying the old string. Change-Id: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 --- M src/sccp_internal.h M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 3 files changed, 6 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 66d768d..651862f 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -5,6 +5,8 @@ #include #include +#define SCCP_STR "Signalling Connection Control Part\n" + /* an instance of the SCCP stack */ struct osmo_sccp_instance { /* entry in global list of ss7 instances */ diff --git a/src/sccp_vty.c b/src/sccp_vty.c index bcedbb6..2727ccc 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -54,8 +54,7 @@ DEFUN(show_sccp_users, show_sccp_users_cmd, "show cs7 instance <0-15> sccp users", - SHOW_STR CS7_STR INST_STR INST_STR - "Signaling Connection Control Part\n" + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR "Show List of SCCP Users registered\n") { int id = atoi(argv[0]); @@ -83,8 +82,7 @@ DEFUN(show_sccp_user_ssn, show_sccp_user_ssn_cmd, "show cs7 instance <0-15> sccp ssn <0-65535>", - SHOW_STR CS7_STR INST_STR INST_STR - "Signaling Connection Control Part\n" + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR "Show List of SCCP Users registered\n") { int id = atoi(argv[0]); @@ -118,8 +116,7 @@ DEFUN(show_sccp_connections, show_sccp_connections_cmd, "show cs7 instance <0-15> sccp connections", - SHOW_STR CS7_STR INST_STR INST_STR - "Signaling Connection Control Part\n" + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR "Show List of SCCP Users registered\n") { int id = atoi(argv[0]); diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index fc46cff..9a86b23 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -42,7 +42,7 @@ users User Table asp Application Server Process (ASP) as Application Server (AS) - sccp Signaling Connection Control Part + sccp Signalling Connection Control Part ss7_asp_vty_test# show cs7 instance 0 as ? active Display all active ASs -- To view, visit https://gerrit.osmocom.org/11115 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: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 Gerrit-Change-Number: 11115 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 Sep 27 16:02:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:02:24 +0000 Subject: Change in libosmo-sccp[master]: vty: tweak two printed strings In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11116 ) Change subject: vty: tweak two printed strings ...................................................................... vty: tweak two printed strings Fix typo "to long". Say 'cs7 instance' instead of 'ss7 instance': we are interacting with a user on the telnet VTY, and that user is configuring a 'cs7 instance'. Especially a lowercase 'ss7' is potentially confusing ("is there an 'ss7' node?"). Changes show in ss7_asp_test.vty. Change-Id: Iebb976531576268d58338895a4baadbca6137b80 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 295fc20..1e2f437 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1289,7 +1289,7 @@ const char *name = argv[0]; if (strlen(name) >= sizeof(entry->name)) { - vty_out(vty, "Error: SCCP address name to long: '%s'%s", + vty_out(vty, "Error: SCCP address name too long: '%s'%s", name, VTY_NEWLINE); return CMD_ERR_INCOMPLETE; } @@ -1299,7 +1299,7 @@ entry = addr_entry_by_name_global(name); if (entry != NULL) { vty_out(vty, - "Error: SCCP address name already used in ss7 instance %u: '%s'%s", + "Error: SCCP address name already used in cs7 instance %u: '%s'%s", entry->inst->cfg.id, entry->name, VTY_NEWLINE); return CMD_ERR_INCOMPLETE; } diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 9a86b23..f96e0c0 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -180,13 +180,13 @@ ss7_asp_vty_test(config-cs7-sccpaddr)# exit ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar -Error: SCCP address name to long: 'foobarfoobarfoobarfoobarfoobarfoobar' +Error: SCCP address name too long: 'foobarfoobarfoobarfoobarfoobarfoobar' % Command incomplete. ss7_asp_vty_test(config-cs7)# exit ss7_asp_vty_test(config)# cs7 instance 1 ss7_asp_vty_test(config-cs7)# sccp-address foo -Error: SCCP address name already used in ss7 instance 0: 'foo' +Error: SCCP address name already used in cs7 instance 0: 'foo' % Command incomplete. ss7_asp_vty_test(config-cs7)# sccp-address bar ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 -- To view, visit https://gerrit.osmocom.org/11116 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: Iebb976531576268d58338895a4baadbca6137b80 Gerrit-Change-Number: 11116 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 Sep 27 16:02:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:02:24 +0000 Subject: Change in libosmo-sccp[master]: vty: install 'show cs7' for sccp addrs on _ve nodes In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11117 ) Change subject: vty: install 'show cs7' for sccp addrs on _ve nodes ...................................................................... vty: install 'show cs7' for sccp addrs on _ve nodes The 'show cs7 instance 0 sccp-addressbook' command should not be inside the 'cs7' node. That defies the point of naming the instance again, and it falls out of place of all the other 'show cs7' commands on the VIEW and ENABLE nodes. Drop the old command within the 'cs7' node without substitution or deprecation. At the same time, drop dash from 'show cs7 i 0 sccp-addressbook' There are various other show cs7 commands already defined in sccp_vty.c, which have 'sccp' as a separate string. Conform to that. Change-Id: I80e0bc0a91bcd3fb75372045db34592d2d663d41 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 13 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 1e2f437..14539b6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -39,6 +39,7 @@ #include "xua_internal.h" #include +#include "sccp_internal.h" #define XUA_VAR_STR "(sua|m3ua|ipa)" @@ -1164,8 +1165,9 @@ /* List all addressbook entries */ DEFUN(cs7_show_sccpaddr, cs7_show_sccpaddr_cmd, - "show cs7 instance <0-15> sccp-addressbook", - SHOW_STR CS7_STR INST_STR INST_STR "List all SCCP addressbook entries\n") + "show cs7 instance <0-15> sccp addressbook", + SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR + "List all SCCP addressbook entries\n") { struct osmo_ss7_instance *inst; struct osmo_sccp_addr_entry *entry; @@ -1727,7 +1729,7 @@ static void vty_init_addr(void) { install_node(&sccpaddr_node, NULL); - install_element(L_CS7_NODE, &cs7_show_sccpaddr_cmd); + install_element_ve(&cs7_show_sccpaddr_cmd); install_element(L_CS7_NODE, &cs7_sccpaddr_cmd); install_element(L_CS7_NODE, &cs7_sccpaddr_del_cmd); install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_pc_del_cmd); diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index f96e0c0..fee97b3 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -4,6 +4,7 @@ show cs7 (sua|m3ua|ipa) [<0-65534>] show cs7 instance <0-15> asp show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections @@ -16,6 +17,7 @@ show cs7 (sua|m3ua|ipa) [<0-65534>] show cs7 instance <0-15> asp show cs7 instance <0-15> as (active|all|m3ua|sua) + show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections @@ -51,6 +53,7 @@ sua Display all SUA ASs ss7_asp_vty_test# show cs7 instance 0 sccp ? + addressbook List all SCCP addressbook entries users Show List of SCCP Users registered ssn Show List of SCCP Users registered connections Show List of SCCP Users registered @@ -74,7 +77,6 @@ no asp NAME as NAME (sua|m3ua|ipa) no as NAME - show cs7 instance <0-15> sccp-addressbook sccp-address NAME no sccp-address NAME @@ -176,7 +178,11 @@ ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 ss7_asp_vty_test(config-cs7-sccpaddr)# do show cs7 instance 0 sccp addressbook -% Unknown command. + +Name RI: PC: SSN: GT: +------------ --- --------- ---------- --------------------------------------- +foo PC 1.2.3 (none) (none) + ss7_asp_vty_test(config-cs7-sccpaddr)# exit ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar -- To view, visit https://gerrit.osmocom.org/11117 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: I80e0bc0a91bcd3fb75372045db34592d2d663d41 Gerrit-Change-Number: 11117 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 Sep 27 16:02:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:02:25 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: allocate ss7->sccp in one common function In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11118 ) Change subject: cosmetic: allocate ss7->sccp in one common function ...................................................................... cosmetic: allocate ss7->sccp in one common function Instead of allocating ss7->sccp in various places, unify that in one common function. We shouldn't spread the decision what to pass as priv pointer around everywhere. There is no functional difference. This is preparation for a patch where the sccp_instance gets allocated from the telnet VTY: I would prefer to hide all allocation details from that code; which also makes sense for the other callers of osmo_sccp_instance_create(). Change-Id: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c M src/sccp_user.c 3 files changed, 20 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index a93c663..34d5408 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -111,6 +111,8 @@ int osmo_ss7_instance_bind(struct osmo_ss7_instance *inst); int osmo_ss7_bind_all_instances(); +struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst); + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 025c21c..9805b3b 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -460,6 +460,18 @@ return rc; } +/*! Allocate an SCCP instance, if not present yet. + * \returns inst->sccp. */ +struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst) +{ + if (inst->sccp) + return inst->sccp; + + LOGSS7(inst, LOGL_NOTICE, "Creating SCCP instance\n"); + inst->sccp = osmo_sccp_instance_create(inst, NULL); + return inst->sccp; +} + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ @@ -1169,8 +1181,8 @@ llist_add_tail(&asp->list, &inst->asp_list); /* The SUA code internally needs SCCP to work */ - if (proto == OSMO_SS7_ASP_PROT_SUA && !inst->sccp) - inst->sccp = osmo_sccp_instance_create(inst, NULL); + if (proto == OSMO_SS7_ASP_PROT_SUA) + osmo_ss7_ensure_sccp(inst); } return asp; @@ -1817,8 +1829,8 @@ llist_add_tail(&oxs->list, &inst->xua_servers); /* The SUA code internally needs SCCP to work */ - if (proto == OSMO_SS7_ASP_PROT_SUA && !inst->sccp) - inst->sccp = osmo_sccp_instance_create(inst, NULL); + if (proto == OSMO_SS7_ASP_PROT_SUA) + osmo_ss7_ensure_sccp(inst); return oxs; } diff --git a/src/sccp_user.c b/src/sccp_user.c index 99ed96e..020166d 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -480,9 +480,7 @@ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name, asp->cfg.name); - /* Allocate SCCP instance */ - LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating SCCP instance\n", name); - ss7->sccp = osmo_sccp_instance_create(ss7, NULL); + osmo_ss7_ensure_sccp(ss7); if (!ss7->sccp) goto out_asp; @@ -562,7 +560,7 @@ goto out_xs; /* Allocate SCCP stack */ - ss7->sccp = osmo_sccp_instance_create(ss7, NULL); + osmo_ss7_ensure_sccp(ss7); if (!ss7->sccp) goto out_xs; -- To view, visit https://gerrit.osmocom.org/11118 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: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 Gerrit-Change-Number: 11118 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 Sep 27 16:03:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:03:10 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: fix doc strings for show ... ssn, connections In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11121 ) Change subject: sccp_vty: fix doc strings for show ... ssn,connections ...................................................................... Patch Set 3: Code-Review+2 re-adding previous +2 after cosmetic rebasing -- To view, visit https://gerrit.osmocom.org/11121 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: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e Gerrit-Change-Number: 11121 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 16:03:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 16:03:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:03:11 +0000 Subject: Change in libosmo-sccp[master]: sccp_vty: fix doc strings for show ... ssn, connections In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11121 ) Change subject: sccp_vty: fix doc strings for show ... ssn,connections ...................................................................... sccp_vty: fix doc strings for show ... ssn,connections For 'show cs7 instance 0 ssn', fix doc string for 'ssn', and add missing one for the SSN arg. This fixes depending builds that see VTY test failures due to the missing doc string. For 'show cs7 instance 0 connectsion', fix doc string for 'connections'. Change-Id: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e --- M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/sccp_vty.c b/src/sccp_vty.c index 2727ccc..b11fec5 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -83,7 +83,8 @@ DEFUN(show_sccp_user_ssn, show_sccp_user_ssn_cmd, "show cs7 instance <0-15> sccp ssn <0-65535>", SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR - "Show List of SCCP Users registered\n") + "Find an SCCP User registered for the given SSN\n" + "Subsystem Number (SSN)\n") { int id = atoi(argv[0]); int ssn = atoi(argv[1]); @@ -117,7 +118,7 @@ DEFUN(show_sccp_connections, show_sccp_connections_cmd, "show cs7 instance <0-15> sccp connections", SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR - "Show List of SCCP Users registered\n") + "Show List of active SCCP connections\n") { int id = atoi(argv[0]); struct osmo_ss7_instance *inst; diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index fee97b3..05c7527 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -55,11 +55,11 @@ ss7_asp_vty_test# show cs7 instance 0 sccp ? addressbook List all SCCP addressbook entries users Show List of SCCP Users registered - ssn Show List of SCCP Users registered - connections Show List of SCCP Users registered + ssn Find an SCCP User registered for the given SSN + connections Show List of active SCCP connections ss7_asp_vty_test# show cs7 instance 0 sccp ssn ? - <0-65535> + <0-65535> Subsystem Number (SSN) ss7_asp_vty_test# configure terminal ss7_asp_vty_test(config)# cs7 instance 0 -- To view, visit https://gerrit.osmocom.org/11121 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: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e Gerrit-Change-Number: 11121 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 Thu Sep 27 16:04:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 16:04:51 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11119/5/src/sccp_internal.h File src/sccp_internal.h: https://gerrit.osmocom.org/#/c/11119/5/src/sccp_internal.h at 27 PS5, Line 27: uint32_t us; hmm, this value is still seconds and microseconds, which sort of came from the previous constants and the need to pass both params to osmo_timer_schedule()... us is always zero now. -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 16:04: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 Sep 27 16:18:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 16:18:31 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 16: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 Thu Sep 27 16:18:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 16:18:36 +0000 Subject: Change in libosmo-sccp[master]: make SCCP timers configurable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11119 ) Change subject: make SCCP timers configurable ...................................................................... make SCCP timers configurable The previous hardcoded SCCP timers may cause SCCP connection releases, if the peer is configured with far lower timers than libosmo-sccp. Testing with a specific SCCPlite MSC, I experienced an iar of just over three minutes, meaning that calls would be cut off by the MSC, since the osmo-bsc failed to send an Inactivity Timer message until seven minutes have passed. With this patch, SCCP timers are configurable by the user. Define constant global default timers, and variable user-configurable timers with each osmo_sccp_instance. Add VTY UI to configure the timers. Users must call osmo_sccp_vty_init() to get the sccp-timer config nodes under the 'cs7' node. Show the new UI in ss7_asp_test.vty. Note that even though this function is not new at all, until recently, all of our SCCP users (osmo-bsc, osmo-msc, osmo-sgsn, osmo-hnbgw) failed to call osmo_sccp_vty_init(), and thus also missed out on the various 'show' commands defined in sccp_vty.c. In other words, to benefit from the timer configurability, the patches to call osmo_sccp_vty_init() must first be merged to the corresponding master branches. If a 'sccp-timer' config command occurs, the cs7 instance must allocate an SCCP instance in order to store the timer config. Do that by calling the recently added osmo_ss7_ensure_sccp() function. Hence remove the limitation that the SCCP instance must not be populated from the "simple" setup function. If we want to configure SCCP timers beforehand, there must be an SCCP instance for that, and there is no hard reason to require a NULL SCCP instance, besides the desire to prevent this function from being invoked twice. Change-Id: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 --- M src/osmo_ss7_vty.c M src/sccp_internal.h M src/sccp_scoc.c M src/sccp_user.c M src/sccp_vty.c M tests/vty/ss7_asp_test.vty 6 files changed, 327 insertions(+), 27 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 14539b6..7ef58cf 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -41,6 +41,8 @@ #include #include "sccp_internal.h" +#include "sccp_internal.h" + #define XUA_VAR_STR "(sua|m3ua|ipa)" #define XUA_VAR_HELP_STR \ @@ -1658,6 +1660,9 @@ /* Append SCCP Addressbook */ write_sccp_addressbook(vty, inst); + + if (inst->sccp) + osmo_sccp_vty_write_cs7_node(vty, " ", inst->sccp); } diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 651862f..000f0f7 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -7,6 +7,36 @@ #define SCCP_STR "Signalling Connection Control Part\n" +/* Appendix C.4 of Q.714 */ +enum osmo_sccp_timer { + OSMO_SCCP_TIMER_CONN_EST, + OSMO_SCCP_TIMER_IAS, + OSMO_SCCP_TIMER_IAR, + OSMO_SCCP_TIMER_REL, + OSMO_SCCP_TIMER_REPEAT_REL, + OSMO_SCCP_TIMER_INT, + OSMO_SCCP_TIMER_GUARD, + OSMO_SCCP_TIMER_RESET, + OSMO_SCCP_TIMER_REASSEMBLY, + /* This must remain the last item: */ + OSMO_SCCP_TIMERS_COUNT +}; + +struct osmo_sccp_timer_val { + uint32_t s; + uint32_t us; +}; + +extern const struct osmo_sccp_timer_val osmo_sccp_timer_defaults[]; + +extern const struct value_string osmo_sccp_timer_names[]; +static inline const char *osmo_sccp_timer_name(enum osmo_sccp_timer val) +{ return get_value_string(osmo_sccp_timer_names, val); } + +extern const struct value_string osmo_sccp_timer_descriptions[]; +static inline const char *osmo_sccp_timer_description(enum osmo_sccp_timer val) +{ return get_value_string(osmo_sccp_timer_descriptions, val); } + /* an instance of the SCCP stack */ struct osmo_sccp_instance { /* entry in global list of ss7 instances */ @@ -23,6 +53,8 @@ void *priv; struct osmo_ss7_user ss7_user; + + struct osmo_sccp_timer_val timers[OSMO_SCCP_TIMERS_COUNT]; }; struct osmo_sccp_user { @@ -90,3 +122,9 @@ struct osmo_fsm sccp_scoc_fsm; void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst); + +const struct osmo_sccp_timer_val *osmo_sccp_timer_get(const struct osmo_sccp_instance *inst, + enum osmo_sccp_timer timer, + bool default_if_unset); + +void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst); diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 1057be0..8138e43 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -64,20 +64,6 @@ #define S(x) (1 << (x)) #define SCU_MSGB_SIZE 1024 -/* Appendix C.4 of Q.714 (all in milliseconds) */ -#define CONNECTION_TIMER ( 1 * 60 * 1000) -#define TX_INACT_TIMER ( 7 * 60 * 1000) /* RFC 3868 Ch. 8. */ -#define RX_INACT_TIMER (15 * 60 * 1000) /* RFC 3868 Ch. 8. */ -#define RELEASE_TIMER ( 10 * 1000) -#define RELEASE_REP_TIMER ( 10 * 1000) -#define INT_TIMER ( 1 * 60 * 1000) -#define GUARD_TIMER (23 * 60 * 1000) -#define RESET_TIMER ( 10 * 1000) - -/* convert from single value in milliseconds to comma-separated - * "seconds, microseconds" format we use in osmocom/core/timers.h */ -#define MSEC_TO_S_US(x) (x/1000), ((x%1000)*1000) - /*********************************************************************** * SCCP connection table ***********************************************************************/ @@ -235,6 +221,109 @@ * Timer Handling ***********************************************************************/ +/* Appendix C.4 of ITU-T Q.714 */ +const struct value_string osmo_sccp_timer_names[] = { + { OSMO_SCCP_TIMER_CONN_EST, "conn_est" }, + { OSMO_SCCP_TIMER_IAS, "ias" }, + { OSMO_SCCP_TIMER_IAR, "iar" }, + { OSMO_SCCP_TIMER_REL, "rel" }, + { OSMO_SCCP_TIMER_REPEAT_REL, "repeat_rel" }, + { OSMO_SCCP_TIMER_INT, "int" }, + { OSMO_SCCP_TIMER_GUARD, "guard" }, + { OSMO_SCCP_TIMER_RESET, "reset" }, + { OSMO_SCCP_TIMER_REASSEMBLY, "reassembly" }, + {} +}; + +/* Mostly pasted from Appendix C.4 of ITU-T Q.714 (05/2001) -- some of their descriptions are quite + * unintelligible out of context, for which we have our own description here. */ +const struct value_string osmo_sccp_timer_descriptions[] = { + { OSMO_SCCP_TIMER_CONN_EST, + "Waiting for connection confirm message, 1 to 2 minutes" }, + { OSMO_SCCP_TIMER_IAS, + "Send keep-alive: on an idle connection, delay before sending an Idle Timer message," + " 5 to 10 minutes" }, + { OSMO_SCCP_TIMER_IAR, + "Receive keep-alive: on an idle connection, delay until considering a connection as stale," + " 11 to 21 minutes" }, + { OSMO_SCCP_TIMER_REL, + "Waiting for release complete message, 10 to 20 seconds" }, + { OSMO_SCCP_TIMER_REPEAT_REL, + "Waiting for release complete message; or to repeat sending released message after the initial" + " expiry, 10 to 20 seconds" }, + { OSMO_SCCP_TIMER_INT, + "Waiting for release complete message; or to release connection resources, freeze the LRN and" + " alert a maintenance function after the initial expiry, extending to 1 minute" }, + { OSMO_SCCP_TIMER_GUARD, + "Waiting to resume normal procedure for temporary connection sections during the restart" + " procedure, 23 to 25 minutes" }, + { OSMO_SCCP_TIMER_RESET, + "Waiting to release temporary connection section or alert maintenance function after reset" + " request message is sent, 10 to 20 seconds" }, + { OSMO_SCCP_TIMER_REASSEMBLY, + "Waiting to receive all the segments of the remaining segments, single segmented message after" + " receiving the first segment, 10 to 20 seconds" }, + {} +}; + +/* Appendix C.4 of ITU-T Q.714 */ +const struct osmo_sccp_timer_val osmo_sccp_timer_defaults[] = { + [OSMO_SCCP_TIMER_CONN_EST] = { .s = 1 * 60, }, + [OSMO_SCCP_TIMER_IAS] = { .s = 7 * 60, }, /* RFC 3868 Ch. 8. */ + [OSMO_SCCP_TIMER_IAR] = { .s = 15 * 60, }, /* RFC 3868 Ch. 8. */ + [OSMO_SCCP_TIMER_REL] = { .s = 10, }, + [OSMO_SCCP_TIMER_REPEAT_REL] = { .s = 10, }, + [OSMO_SCCP_TIMER_INT] = { .s = 1 * 60, }, + [OSMO_SCCP_TIMER_GUARD] = { .s = 23 * 60, }, + [OSMO_SCCP_TIMER_RESET] = { .s = 10, }, + [OSMO_SCCP_TIMER_REASSEMBLY] = { .s = 10, }, +}; + +osmo_static_assert(ARRAY_SIZE(osmo_sccp_timer_defaults) == OSMO_SCCP_TIMERS_COUNT, + assert_osmo_sccp_timers_count); + +/* Look up an SCCP timer value as configured in the osmo_ss7_instance. + * If no user defined value is set, return the global default from osmo_sccp_timer_defaults instead. + * However, if default_if_unset is passed false, return NULL in case there is no user defined setting, or + * in case it is identical to the global default. */ +const struct osmo_sccp_timer_val *osmo_sccp_timer_get(const struct osmo_sccp_instance *inst, + enum osmo_sccp_timer timer, + bool default_if_unset) +{ + const struct osmo_sccp_timer_val *val; + const struct osmo_sccp_timer_val *def; + + OSMO_ASSERT(timer >= 0 + && timer < ARRAY_SIZE(inst->timers) + && timer < ARRAY_SIZE(osmo_sccp_timer_defaults)); + + val = &inst->timers[timer]; + def = &osmo_sccp_timer_defaults[timer]; + + /* Assert that all timer definitions have a sane global default */ + OSMO_ASSERT(def->s || def->us); + + if (val->s || val->us) { + if (!default_if_unset && val->s == def->s && val->us == def->us) + return NULL; + return val; + } + + if (!default_if_unset) + return NULL; + + /* If unset, use the global default. */ + return def; +} + +static void sccp_timer_schedule(const struct sccp_connection *conn, + struct osmo_timer_list *timer, + enum osmo_sccp_timer timer_name) +{ + const struct osmo_sccp_timer_val *val = osmo_sccp_timer_get(conn->inst, timer_name, true); + osmo_timer_schedule(timer, val->s, val->us); +} + /* T(ias) has expired, send a COIT message to the peer */ static void tx_inact_tmr_cb(void *data) { @@ -280,13 +369,13 @@ /* Re-start the Tx inactivity timer */ static void conn_restart_tx_inact_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_ias, MSEC_TO_S_US(TX_INACT_TIMER)); + sccp_timer_schedule(conn, &conn->t_ias, OSMO_SCCP_TIMER_IAS); } /* Re-start the Rx inactivity timer */ static void conn_restart_rx_inact_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_iar, MSEC_TO_S_US(RX_INACT_TIMER)); + sccp_timer_schedule(conn, &conn->t_iar, OSMO_SCCP_TIMER_IAR); } /* Re-start both Rx and Tx inactivity timers */ @@ -306,19 +395,19 @@ /* Start release timer T(rel) */ static void conn_start_rel_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_rel, MSEC_TO_S_US(RELEASE_TIMER)); + sccp_timer_schedule(conn, &conn->t_rel, OSMO_SCCP_TIMER_REL); } /* Start repeat release timer T(rep_rel) */ static void conn_start_rep_rel_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_rep_rel, MSEC_TO_S_US(RELEASE_REP_TIMER)); + sccp_timer_schedule(conn, &conn->t_rep_rel, OSMO_SCCP_TIMER_REPEAT_REL); } /* Start interval timer T(int) */ static void conn_start_int_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_int, MSEC_TO_S_US(INT_TIMER)); + sccp_timer_schedule(conn, &conn->t_int, OSMO_SCCP_TIMER_INT); } /* Stop all release related timers: T(rel), T(int) and T(rep_rel) */ @@ -332,7 +421,7 @@ /* Start connect timer T(conn) */ static void conn_start_connect_timer(struct sccp_connection *conn) { - osmo_timer_schedule(&conn->t_conn, MSEC_TO_S_US(CONNECTION_TIMER)); + sccp_timer_schedule(conn, &conn->t_conn, OSMO_SCCP_TIMER_CONN_EST); } /* Stop connect timer T(conn) */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 020166d..793e08c 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -396,13 +396,6 @@ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using SS7 instance %u, pc:%s\n", name, ss7->cfg.id, osmo_ss7_pointcode_print(ss7, ss7->cfg.primary_pc)); - /* There must not be an existing SCCP istance, regarless if the simple - * client has created the SS7 instance or if it was already present. - * An already existing SCCP instance would be an indication that this - * function has been called twice with the same SS7 instance, which - * must not be the case! */ - OSMO_ASSERT(ss7->sccp == NULL); - /* Check if there is already an application server that matches * the protocol we intend to use. If not, we will create one. */ as = osmo_ss7_as_find_by_proto(ss7, prot); diff --git a/src/sccp_vty.c b/src/sccp_vty.c index b11fec5..46afb49 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -141,9 +141,125 @@ return CMD_SUCCESS; } +/* sccp-timer <1-999999> + * (cmdstr and doc are dynamically generated from osmo_sccp_timer_names.) */ +DEFUN(sccp_timer, sccp_timer_cmd, + NULL, NULL) +{ + struct osmo_ss7_instance *ss7 = vty->index; + enum osmo_sccp_timer timer = get_string_value(osmo_sccp_timer_names, argv[0]); + struct osmo_sccp_timer_val set_val = { .s = atoi(argv[1]) }; + + if (timer < 0 || timer >= OSMO_SCCP_TIMERS_COUNT) { + vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_ss7_ensure_sccp(ss7); + if (!ss7->sccp) { + vty_out(vty, "%% Error: cannot instantiate SCCP instance%s", VTY_NEWLINE); + return CMD_WARNING; + } + + ss7->sccp->timers[timer] = set_val; + return CMD_SUCCESS; +} + +static const char *osmo_sccp_timer_val_name(const struct osmo_sccp_timer_val *val) +{ + static char buf[16]; + + snprintf(buf, sizeof(buf), "%u", val->s); + return buf; +} + +static void gen_sccp_timer_cmd_strs(struct cmd_element *cmd) +{ + int i; + char *cmd_str = NULL; + char *doc_str = NULL; + + OSMO_ASSERT(cmd->string == NULL); + OSMO_ASSERT(cmd->doc == NULL); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "sccp-timer ("); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Configure SCCP timer values, see ITU-T Q.714\n"); + + for (i = 0; osmo_sccp_timer_names[i].str; i++) { + const struct osmo_sccp_timer_val *def; + enum osmo_sccp_timer timer; + + timer = osmo_sccp_timer_names[i].value; + def = &osmo_sccp_timer_defaults[timer]; + OSMO_ASSERT(timer >= 0 && timer < OSMO_SCCP_TIMERS_COUNT); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "%s%s", + i ? "|" : "", + osmo_sccp_timer_name(timer)); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %s)\n", + osmo_sccp_timer_description(timer), + osmo_sccp_timer_val_name(def)); + } + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, ") <1-999999>"); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Timer value, in seconds\n"); + + cmd->string = cmd_str; + cmd->doc = doc_str; +} + +static void write_sccp_timers(struct vty *vty, const char *indent, + struct osmo_sccp_instance *inst, bool default_if_unset) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(inst->timers); i++) { + const struct osmo_sccp_timer_val *val = osmo_sccp_timer_get(inst, i, default_if_unset); + if (!val) + continue; + vty_out(vty, "%ssccp-timer %s %s%s", indent, osmo_sccp_timer_name(i), + osmo_sccp_timer_val_name(val), VTY_NEWLINE); + } +} + +void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst) +{ + write_sccp_timers(vty, indent, inst, false); +} + +DEFUN(show_sccp_timers, show_sccp_timers_cmd, + "show cs7 instance <0-15> sccp timers", + SHOW_STR CS7_STR INST_STR INST_STR + "Signaling Connection Control Part\n" + "Show List of SCCP timers\n") +{ + int id = atoi(argv[0]); + struct osmo_ss7_instance *ss7; + + ss7 = osmo_ss7_instance_find(id); + if (!ss7) { + vty_out(vty, "No SS7 instance %d found%s", id, VTY_NEWLINE); + return CMD_WARNING; + } + + if (!ss7->sccp) { + vty_out(vty, "SS7 instance %d has no SCCP initialized%s", id, VTY_NEWLINE); + return CMD_SUCCESS; + } + + write_sccp_timers(vty, "", ss7->sccp, true); + return CMD_SUCCESS; +} + void osmo_sccp_vty_init(void) { install_element_ve(&show_sccp_users_cmd); install_element_ve(&show_sccp_user_ssn_cmd); install_element_ve(&show_sccp_connections_cmd); + + install_element_ve(&show_sccp_timers_cmd); + gen_sccp_timer_cmd_strs(&sccp_timer_cmd); + install_element(L_CS7_NODE, &sccp_timer_cmd); } diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 05c7527..cb8dc85 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -8,6 +8,7 @@ show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections + show cs7 instance <0-15> sccp timers ... !show cs7 ss7_asp_vty_test> enable @@ -21,6 +22,7 @@ show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> show cs7 instance <0-15> sccp connections + show cs7 instance <0-15> sccp timers ... !show cs7 ss7_asp_vty_test# show ? @@ -57,6 +59,7 @@ users Show List of SCCP Users registered ssn Find an SCCP User registered for the given SSN connections Show List of active SCCP connections + timers Show List of SCCP timers ss7_asp_vty_test# show cs7 instance 0 sccp ssn ? <0-65535> Subsystem Number (SSN) @@ -79,6 +82,7 @@ no as NAME sccp-address NAME no sccp-address NAME + sccp-timer (conn_est|ias|iar|rel|repeat_rel|int|guard|reset|reassembly) <1-999999> ss7_asp_vty_test(config-cs7)# ? ... @@ -90,6 +94,7 @@ no Negate a command or set its defaults as Configure an Application Server sccp-address Create/Modify an SCCP addressbook entry + sccp-timer Configure SCCP timer values, see ITU-T Q.714 ss7_asp_vty_test(config-cs7)# description ? TEXT Text until the end of the line @@ -354,3 +359,57 @@ AS Name State Context Dpc Si Opc Ssn Min Max ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- my-ass AS_DOWN 0 3.2.1 + + +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +SS7 instance 0 has no SCCP initialized + +ss7_asp_vty_test(config-cs7)# show running-config +... !sccp-timer + +ss7_asp_vty_test(config-cs7)# sccp-timer ias 5 +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +sccp-timer conn_est 60 +sccp-timer ias 5 +sccp-timer iar 900 +sccp-timer rel 10 +sccp-timer repeat_rel 10 +sccp-timer int 60 +sccp-timer guard 1380 +sccp-timer reset 10 +sccp-timer reassembly 10 +ss7_asp_vty_test(config-cs7)# show running-config +... !sccp-timer + sccp-timer ias 5 +... !sccp-timer + +ss7_asp_vty_test(config-cs7)# sccp-timer ias 420 +ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers +sccp-timer conn_est 60 +sccp-timer ias 420 +sccp-timer iar 900 +sccp-timer rel 10 +sccp-timer repeat_rel 10 +sccp-timer int 60 +sccp-timer guard 1380 +sccp-timer reset 10 +sccp-timer reassembly 10 +ss7_asp_vty_test(config-cs7)# show running-config +... !sccp-timer + +ss7_asp_vty_test(config-cs7)# sccp-timer? + sccp-timer Configure SCCP timer values, see ITU-T Q.714 + +ss7_asp_vty_test(config-cs7)# sccp-timer ? + conn_est Waiting for connection confirm message, 1 to 2 minutes (default: 60) + ias Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes (default: 420) + iar Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes (default: 900) + rel Waiting for release complete message, 10 to 20 seconds (default: 10) + repeat_rel Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds (default: 10) + int Waiting for release complete message; or to release connection resources, freeze the LRN and alert a maintenance function after the initial expiry, extending to 1 minute (default: 60) + guard Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes (default: 1380) + reset Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds (default: 10) + reassembly Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds (default: 10) + +ss7_asp_vty_test(config-cs7)# sccp-timer conn_est ? + <1-999999> Timer value, in seconds -- To view, visit https://gerrit.osmocom.org/11119 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: I28a7362aa838e648ecc9b26ee53dbcade81a9d65 Gerrit-Change-Number: 11119 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 Thu Sep 27 16:57:44 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 16:57:44 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix asan complaints Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11132 Change subject: osmo-config-merge: Fix asan complaints ...................................................................... osmo-config-merge: Fix asan complaints Change-Id: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 --- M utils/osmo-config-merge.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/11132/1 diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index 3762c67..26d974f 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -49,6 +49,8 @@ #include #include +static void *ctx; + struct node { struct node *parent; /* back-pointer */ struct llist_head list; /* part of parent->children */ @@ -220,6 +222,7 @@ static void exit_usage(int rc) { fprintf(stderr, "Usage: osmo-config-merge [--debug]\n"); + talloc_free(ctx); exit(rc); } @@ -230,7 +233,7 @@ struct node *base_tree, *patch_tree; bool debug_enabled = false; - void *ctx = talloc_named_const(NULL, 0, "root"); + ctx = talloc_named_const(NULL, 0, "root"); if (argc < 3) exit_usage(1); @@ -265,4 +268,5 @@ /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */ talloc_free(patch_tree); talloc_free(base_tree); + talloc_free(ctx); } -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 16:57:45 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 16:57:45 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11133 Change subject: osmo-config-merge: Add manual page ...................................................................... osmo-config-merge: Add manual page Change-Id: Ifaa5afe28779a805764caf76a89efb0a3169942e --- M Makefile.am M configure.ac A man/Makefile.am A man/osmo-config-merge.txt 4 files changed, 94 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/11133/1 diff --git a/Makefile.am b/Makefile.am index de5eb35..745d482 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ diff --git a/configure.ac b/configure.ac index bc3358a..c011fea 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,21 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") +AC_ARG_ENABLE([man-doc], + AS_HELP_STRING([--disable-man-doc], [Disable man page documentation]), + AS_IF([test "x$enable_man_doc" = "xno"], [enable_man_doc=no], + [enable_man_doc=yes]), [enable_man_doc=yes]) +AM_CONDITIONAL([BUILD_MAN], [test "x$enable_man_doc" == "xyes"]) + +AC_CHECK_PROG(A2X, [a2x], [a2x]) +AM_CONDITIONAL([BUILD_MAN], [test -n "$A2X"]) + +AS_IF([test "$need_a2x" = "yes"], [ + AC_CHECK_PROG(A2X, [a2x], [found], [no]) + AS_IF([test "$A2X" != "found"], + [AC_MSG_ERROR([a2x not found, please install asciidoc])]) +]) + # check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include ]]) @@ -370,6 +385,7 @@ libosmoctrl.pc libosmosim.pc include/Makefile + man/Makefile src/Makefile src/vty/Makefile src/codec/Makefile diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..043c965 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,15 @@ +if BUILD_MAN +man_MANS = osmo-config-merge.8 +endif + +A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir} + +ASCIIDOCS = osmo-config-merge.txt + +osmo-config-merge.8 : ${ASCIIDOCS} + ${A2X} ${A2X_OPTS_MANPAGE} osmo-config-merge.txt + +EXTRA_DIST = ${ASCIIDOCS} + +CLEANFILES = \ + osmo-config-merge.8 diff --git a/man/osmo-config-merge.txt b/man/osmo-config-merge.txt new file mode 100644 index 0000000..45c765b --- /dev/null +++ b/man/osmo-config-merge.txt @@ -0,0 +1,62 @@ +osmo-config-merge(8) +===================== + +NAME +---- +osmo-config-merge - Merge osmocom config snippets into an existing config + +SYNOPSIS +-------- +[verse] +*osmo-config-merge* [--debug] + +DESCRIPTION +----------- +This utility allows you to merge an incremental config "patch" +into an osmocom-style config file. + +The patch file follows the same syntax as the original config file. + +It works by appending the leaf nodes of the patch file to the respective +nodes of the input config file. + +This process allows configuration file changes/updates to be performed +in a more stable/reliable way than by means of (unified) diff files, +as they break every time the context lines break. + +osmo-config-merge doesn't suffer from this problem, as it understands +the tree-like nature of VTY config files. + +The resulting config is printed to stdout. + +NOTE: This only works with configuration files that have proper +indenting, i.e. every level in the hierarchy must be indented excatly +one character, not multiple. + +OPTIONS +------- +*--debug*:: + Show debugging output when parsing the config tree. Needs to be the last argument. + +EXAMPLE USAGE +------------- +[verse] +$ osmo-config-merge osmo-msc.cfg.base osmo-msc_change_network.cfg > osmo-msc.cfg + +EXIT STATUS +----------- +Exit status is 0 if the command was successful, and 1 in case of a +wrong/missing argument. If the tool detects an error in the patch file the +exit status is 2. + +SEE ALSO +-------- +[verse] +The official Osmocom documentation including the VTY config refernce can be +found at: http://ftp.osmocom.org/docs/latest/ +The Osmocom wiki is located at: http://projects.osmocom.org/ + + +AUTHOR +------ +osmo-config-merge was written by Harald Welte -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 17:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 27 Sep 2018 17:05:49 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix asan complaints In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix asan complaints ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11132/1/utils/osmo-config-merge.c File utils/osmo-config-merge.c: https://gerrit.osmocom.org/#/c/11132/1/utils/osmo-config-merge.c at 238 PS1, Line 238: if (argc < 3) I think you could just move this condition before the allocation of 'ctx' ;) -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 27 Sep 2018 17:05:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 18:11:46 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 18:11:46 +0000 Subject: Change in libosmocore[master]: Fix --disable-man-doc option Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11134 Change subject: Fix --disable-man-doc option ...................................................................... Fix --disable-man-doc option Build the manuals only if it is not disabled in configure. Previously the option did not have any effect. Change-Id: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580 --- M configure.ac M man/Makefile.am 2 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/11134/1 diff --git a/configure.ac b/configure.ac index c011fea..31f6f04 100644 --- a/configure.ac +++ b/configure.ac @@ -78,19 +78,16 @@ AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") AC_ARG_ENABLE([man-doc], - AS_HELP_STRING([--disable-man-doc], [Disable man page documentation]), - AS_IF([test "x$enable_man_doc" = "xno"], [enable_man_doc=no], - [enable_man_doc=yes]), [enable_man_doc=yes]) -AM_CONDITIONAL([BUILD_MAN], [test "x$enable_man_doc" == "xyes"]) + [AS_HELP_STRING([--disable-man-doc], [Disable man page documentation])], + [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ]) -AC_CHECK_PROG(A2X, [a2x], [a2x]) -AM_CONDITIONAL([BUILD_MAN], [test -n "$A2X"]) - -AS_IF([test "$need_a2x" = "yes"], [ - AC_CHECK_PROG(A2X, [a2x], [found], [no]) - AS_IF([test "$A2X" != "found"], +AS_IF([test "x$BUILD_MAN" = "xyes"], [ + AC_CHECK_PROG(A2X, [a2x], [yes]) + AS_IF([test "$A2X" != "yes"], [AC_MSG_ERROR([a2x not found, please install asciidoc])]) ]) +AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes") +AC_SUBST(BUILD_MAN) # check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include ]]) diff --git a/man/Makefile.am b/man/Makefile.am index 043c965..927db21 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -7,7 +7,7 @@ ASCIIDOCS = osmo-config-merge.txt osmo-config-merge.8 : ${ASCIIDOCS} - ${A2X} ${A2X_OPTS_MANPAGE} osmo-config-merge.txt + a2x ${A2X_OPTS_MANPAGE} osmo-config-merge.txt EXTRA_DIST = ${ASCIIDOCS} -- To view, visit https://gerrit.osmocom.org/11134 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: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580 Gerrit-Change-Number: 11134 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 19:26:35 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 19:26:35 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11132 to look at the new patch set (#2). Change subject: osmo-config-merge: Fix some small issues ...................................................................... osmo-config-merge: Fix some small issues Allocate NULL context after exit_usage() calls and free it before exit so * sanitizer is happy. Also handle the error cases gracefully when a file is unreadable or formatted wrong. Change-Id: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 --- M utils/osmo-config-merge.c 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/11132/2 -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 19:26:35 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 19:26:35 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11133 to look at the new patch set (#2). Change subject: osmo-config-merge: Add manual page ...................................................................... osmo-config-merge: Add manual page Change-Id: Ifaa5afe28779a805764caf76a89efb0a3169942e --- M Makefile.am M configure.ac A man/Makefile.am A man/osmo-config-merge.txt 4 files changed, 91 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/11133/2 -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 19:29:32 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 19:29:32 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11132/1/utils/osmo-config-merge.c File utils/osmo-config-merge.c: https://gerrit.osmocom.org/#/c/11132/1/utils/osmo-config-merge.c at 238 PS1, Line 238: > I think you could just move this condition before [?] Done. I also fixed some issues with exiting when the file is not readable or formatted correctly. -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 27 Sep 2018 19:29:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 19:33:12 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 19:33:12 +0000 Subject: Change in libosmocore[master]: Fix --disable-man-doc option In-Reply-To: References: Message-ID: daniel has abandoned this change. ( https://gerrit.osmocom.org/11134 ) Change subject: Fix --disable-man-doc option ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11134 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: I7e9f6a6507d4f7c4bacdd737ff73b07aa94bc580 Gerrit-Change-Number: 11134 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 19:35:28 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 27 Sep 2018 19:35:28 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 27 Sep 2018 19:35:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 19:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:10 +0000 Subject: Change in osmo-bsc[master]: make: allow vty-tests without configure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11122 ) Change subject: make: allow vty-tests without configure ...................................................................... Patch Set 1: Code-Review+2 let me just push this one a little, it's fairly trivial and similar changes have been merged to other repositries -- To view, visit https://gerrit.osmocom.org/11122 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: I8cb165890ed77bea8ae82f5228828fa19ff7e0b9 Gerrit-Change-Number: 11122 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 19: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 Thu Sep 27 19:57:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:19 +0000 Subject: Change in osmo-bsc[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11109 ) Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: I2eb7f5cf9ffceeeb14882190d8545601795d3288 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0dbe81c..60175e1 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -832,6 +832,7 @@ /* Initalize SS7 */ osmo_ss7_init(); osmo_ss7_vty_init_asp(tall_bsc_ctx); + osmo_sccp_vty_init(); /* parse options */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/11109 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: I2eb7f5cf9ffceeeb14882190d8545601795d3288 Gerrit-Change-Number: 11109 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 Sep 27 19:57:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:20 +0000 Subject: Change in osmo-bsc[master]: make: allow vty-tests without configure In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11122 ) Change subject: make: allow vty-tests without configure ...................................................................... make: allow vty-tests without configure Change-Id: I8cb165890ed77bea8ae82f5228828fa19ff7e0b9 --- M tests/Makefile.am 1 file changed, 4 insertions(+), 4 deletions(-) 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/tests/Makefile.am b/tests/Makefile.am index 9b4cfe4..446276b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -49,6 +49,10 @@ $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count +else +python-tests: $(BUILT_SOURCES) + echo "Not running python-based tests (determined at configure-time)" +endif # To update the VTY script from current application behavior, # pass -u to vty_script_runner.py by doing: @@ -58,10 +62,6 @@ -n OsmoBSC -p 4242 \ -r "$(top_builddir)/src/osmo-bsc/osmo-bsc -c $(top_srcdir)/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg" \ $(U) $(srcdir)/*.vty -else -python-tests: $(BUILT_SOURCES) - echo "Not running python-based tests (determined at configure-time)" -endif check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) -- To view, visit https://gerrit.osmocom.org/11122 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: I8cb165890ed77bea8ae82f5228828fa19ff7e0b9 Gerrit-Change-Number: 11122 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 Thu Sep 27 19:57:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:21 +0000 Subject: Change in osmo-bsc[master]: test neighbor ident vty docs In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11123 ) Change subject: test neighbor ident vty docs ...................................................................... test neighbor ident vty docs Change-Id: I83a2b03c6a081c4ed3225d79d342913a261d9c1c --- M tests/neighbor_ident.vty 1 file changed, 89 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index bbdb461..dadbe13 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -90,6 +90,95 @@ neighbor del arfcn <0-1023> bsic (<0-63>|any) ... +OsmoBSC(config-net-bts)# neighbor? + neighbor Neighbor cell list + +OsmoBSC(config-net-bts)# neighbor ? + add Add local or remote-BSS neighbor cell + del Remove local or remote-BSS neighbor cell + +OsmoBSC(config-net-bts)# neighbor add ? + bts Neighbor cell by local BTS number + lac Neighbor cell by LAC + lac-ci Neighbor cell by LAC and CI + cgi Neighbor cell by cgi + +OsmoBSC(config-net-bts)# neighbor add bts ? + <0-255> BTS number +OsmoBSC(config-net-bts)# neighbor add bts 0 ? + + +OsmoBSC(config-net-bts)# neighbor add lac ? + <0-65535> LAC +OsmoBSC(config-net-bts)# neighbor add lac 0 ? + arfcn ARFCN of neighbor cell + +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic 0 ? + + +OsmoBSC(config-net-bts)# neighbor add lac-ci ? + <0-65535> LAC +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 ? + <0-65535> CI +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 ? + arfcn ARFCN of neighbor cell + +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic 0 ? + + +OsmoBSC(config-net-bts)# neighbor add cgi ? + <0-999> MCC +OsmoBSC(config-net-bts)# neighbor add cgi 0 ? + <0-999> MNC +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 ? + <0-65535> LAC +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 ? + <0-65535> CI +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 ? + arfcn ARFCN of neighbor cell +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic 0 ? + + +OsmoBSC(config-net-bts)# neighbor del ? + bts Neighbor cell by local BTS number + arfcn ARFCN of neighbor cell + +OsmoBSC(config-net-bts)# neighbor del bts ? + <0-255> BTS number +OsmoBSC(config-net-bts)# neighbor del bts 0 ? + + +OsmoBSC(config-net-bts)# neighbor del arfcn ? + <0-1023> ARFCN value +OsmoBSC(config-net-bts)# neighbor del arfcn 0 ? + bsic BSIC of neighbor cell +OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic ? + <0-63> BSIC value + any for all BSICs / use any BSIC in this ARFCN +OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic 0 ? + + OsmoBSC(config-net-bts)# show running-config ... !neighbor add -- To view, visit https://gerrit.osmocom.org/11123 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: I83a2b03c6a081c4ed3225d79d342913a261d9c1c Gerrit-Change-Number: 11123 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 Thu Sep 27 19:57:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:21 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: drop keyword 'add' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11124 ) Change subject: neighbor vty: drop keyword 'add' ...................................................................... neighbor vty: drop keyword 'add' When writing the neighbor configuration documentation, I noticed that 'neighbor add' and 'neighbor del' make sense from an interactive VTY POV, but when looking at a static config file, it makes more sense to simply name the neighbors without the 'add' keyword, and to use the 'no' prefix instead of the 'del' keyword. It still makes sense to tweak cosmetics like this before inter-bsc handover is used anywhere. First, remove 'add' from all 'neighbor add ...' commands. Instead, prepend "Add" to the doc string for the cell identification argument in commands that add a neighbor: -OsmoBSC(config-net-bts)# neighbor add ? - bts Neighbor cell by local BTS number +OsmoBSC(config-net-bts)# neighbor ? + bts Add Neighbor cell by local BTS number (A subsequent patch will rename 'neighbor del' to 'no neighbor'.) Change-Id: I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 111 insertions(+), 113 deletions(-) Approvals: Harald Welte: 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 28f4afd..8db9db7 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -68,10 +68,10 @@ return true; } -#define NEIGHBOR_ADD_CMD "neighbor add " +#define NEIGHBOR_ADD_CMD "neighbor " #define NEIGHBOR_DEL_CMD "neighbor del " -#define NEIGHBOR_DOC "Neighbor cell list\n" -#define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n" +#define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n" +#define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add " #define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" #define LAC_PARAMS "lac <0-65535>" @@ -431,7 +431,7 @@ return true; #define NEIGH_BSS_WRITE(fmt, args...) do { \ - vty_out(vty, "%sneighbor add " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \ + vty_out(vty, "%sneighbor " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \ if (key->bsic == BSIC_ANY) \ vty_out(vty, "bsic any"); \ else \ @@ -485,7 +485,7 @@ struct gsm_bts_ref *neigh; llist_for_each_entry(neigh, &bts->local_neighbors, entry) { - vty_out(vty, "%sneighbor add lac-ci %u %u%s", + vty_out(vty, "%sneighbor lac-ci %u %u%s", indent, neigh->bts->location_area_code, neigh->bts->cell_identity, VTY_NEWLINE); } diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index dadbe13..644e330 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -80,84 +80,81 @@ OsmoBSC(config-net)# bts 0 OsmoBSC(config-net-bts)# list ... - neighbor add bts <0-255> - neighbor add lac <0-65535> - 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-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 bts <0-255> + neighbor lac <0-65535> + neighbor lac-ci <0-65535> <0-65535> + neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) + neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) + neighbor 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) ... OsmoBSC(config-net-bts)# neighbor? - neighbor Neighbor cell list + neighbor Manage local and remote-BSS neighbor cells OsmoBSC(config-net-bts)# neighbor ? - add Add local or remote-BSS neighbor cell - del Remove local or remote-BSS neighbor cell + bts Add Neighbor cell by local BTS number + lac Add Neighbor cell by LAC + lac-ci Add Neighbor cell by LAC and CI + cgi Add Neighbor cell by cgi + del Remove local or remote-BSS neighbor cell -OsmoBSC(config-net-bts)# neighbor add ? - bts Neighbor cell by local BTS number - lac Neighbor cell by LAC - lac-ci Neighbor cell by LAC and CI - cgi Neighbor cell by cgi - -OsmoBSC(config-net-bts)# neighbor add bts ? +OsmoBSC(config-net-bts)# neighbor bts ? <0-255> BTS number -OsmoBSC(config-net-bts)# neighbor add bts 0 ? +OsmoBSC(config-net-bts)# neighbor bts 0 ? -OsmoBSC(config-net-bts)# neighbor add lac ? +OsmoBSC(config-net-bts)# neighbor lac ? <0-65535> LAC -OsmoBSC(config-net-bts)# neighbor add lac 0 ? +OsmoBSC(config-net-bts)# neighbor lac 0 ? arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor add lac 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# neighbor lac 0 arfcn 0 bsic 0 ? -OsmoBSC(config-net-bts)# neighbor add lac-ci ? +OsmoBSC(config-net-bts)# neighbor lac-ci ? <0-65535> LAC -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 ? <0-65535> CI -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 ? arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor add lac-ci 0 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# neighbor lac-ci 0 0 arfcn 0 bsic 0 ? -OsmoBSC(config-net-bts)# neighbor add cgi ? +OsmoBSC(config-net-bts)# neighbor cgi ? <0-999> MCC -OsmoBSC(config-net-bts)# neighbor add cgi 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 ? <0-999> MNC -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 ? <0-65535> LAC -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 ? <0-65535> CI -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 ? arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor add cgi 0 0 0 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ? OsmoBSC(config-net-bts)# neighbor del ? @@ -180,72 +177,73 @@ OsmoBSC(config-net-bts)# show running-config -... !neighbor add +... !neighbor -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 64 +OsmoBSC(config-net-bts)# ! BSIC out of range +OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 64 % Unknown command. -OsmoBSC(config-net-bts)# neighbor add bts 0 +OsmoBSC(config-net-bts)# neighbor bts 0 % Error: cannot add local BTS 0 as neighbor to BTS 0: Invalid argument OsmoBSC(config-net-bts)# show running-config -... !neighbor add +... !neighbor -OsmoBSC(config-net-bts)# neighbor add bts 1 +OsmoBSC(config-net-bts)# neighbor bts 1 % BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 -OsmoBSC(config-net-bts)# neighbor add lac 22 +OsmoBSC(config-net-bts)# neighbor lac 22 % 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 +OsmoBSC(config-net-bts)# neighbor 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 OsmoBSC(config-net-bts)# ### adding the same entry again results in no change -OsmoBSC(config-net-bts)# neighbor add bts 1 +OsmoBSC(config-net-bts)# neighbor bts 1 % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 -OsmoBSC(config-net-bts)# neighbor add lac-ci 21 31 +OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor 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 -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor 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 -OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor 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 -OsmoBSC(config-net-bts)# neighbor add cgi 23 042 423 6 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor cgi 23 042 423 6 arfcn 23 bsic 42 % BTS 0 to ARFCN 23 BSIC 42 now has 2 remote BSS Cell Identifier List entries -OsmoBSC(config-net-bts)# neighbor add lac 456 arfcn 123 bsic 45 +OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45 % BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry -OsmoBSC(config-net-bts)# neighbor add cgi 23 042 234 56 arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# neighbor cgi 23 042 234 56 arfcn 23 bsic 42 % BTS 0 to ARFCN 23 BSIC 42 now has 3 remote BSS Cell Identifier List entries -OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic any +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any % BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry -OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic 63 +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 63 % BTS 0 to ARFCN 423 BSIC 63 now has 1 remote BSS Cell Identifier List entry -OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic 1 +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 1 % BTS 0 to ARFCN 423 BSIC 1 now has 1 remote BSS Cell Identifier List entry OsmoBSC(config-net-bts)# show running-config ... network -... !neighbor add +... !neighbor bts 0 -... !neighbor add - neighbor add lac-ci 21 31 - 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 - 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 - neighbor add lac-ci 789 10 arfcn 423 bsic 1 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor cgi 023 42 423 5 arfcn 23 bsic 42 + neighbor cgi 023 042 423 6 arfcn 23 bsic 42 + neighbor cgi 023 042 234 56 arfcn 23 bsic 42 + neighbor lac 456 arfcn 123 bsic 45 + neighbor lac-ci 789 10 arfcn 423 bsic any + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 99 bsic any % No entry for BTS 0 to ARFCN 99 (any BSIC) @@ -254,10 +252,10 @@ % BTS 0 to ARFCN 41 (any BSIC) resolves to local BTS 1 lac-ci 21 31 OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 1 -% neighbor add lac-ci 789 10 arfcn 423 bsic 1 +% neighbor lac-ci 789 10 arfcn 423 bsic 1 OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23 -% neighbor add lac-ci 789 10 arfcn 423 bsic 23 +% neighbor lac-ci 789 10 arfcn 423 bsic 23 OsmoBSC(config-net-bts)# neighbor del arfcn 99 bsic 7 % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7 @@ -266,75 +264,75 @@ % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - 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 - neighbor add lac-ci 789 10 arfcn 423 bsic 1 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac 456 arfcn 123 bsic 45 + neighbor lac-ci 789 10 arfcn 423 bsic any + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 123 bsic 45 % Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - 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 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac-ci 789 10 arfcn 423 bsic any + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic any % Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC) OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - 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 +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac-ci 789 10 arfcn 423 bsic 63 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - neighbor add lac-ci 22 65535 - neighbor add lac-ci 789 10 arfcn 423 bsic 1 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 + neighbor lac-ci 789 10 arfcn 423 bsic 1 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 1 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 21 31 - neighbor add lac-ci 22 65535 -... !neighbor add +... !neighbor + neighbor lac-ci 21 31 + neighbor lac-ci 22 65535 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any % Removed local neighbor bts 0 to bts 1 OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 22 65535 -... !neighbor add +... !neighbor + neighbor lac-ci 22 65535 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any % Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC) OsmoBSC(config-net-bts)# show running-config -... !neighbor add - neighbor add lac-ci 22 65535 -... !neighbor add +... !neighbor + neighbor lac-ci 22 65535 +... !neighbor OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 % Removed local neighbor bts 0 to bts 2 OsmoBSC(config-net-bts)# show running-config -... !neighbor add +... !neighbor -- To view, visit https://gerrit.osmocom.org/11124 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: I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8 Gerrit-Change-Number: 11124 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 Thu Sep 27 19:57:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:22 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: rather 'no neighbor', not 'neighbor del' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11125 ) Change subject: neighbor vty: rather 'no neighbor', not 'neighbor del' ...................................................................... neighbor vty: rather 'no neighbor', not 'neighbor del' Now the scheme nicely matches: bts 0 neighbor bts 1 no neighbor bts 1 Change-Id: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 23 insertions(+), 21 deletions(-) Approvals: Harald Welte: 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 8db9db7..70240ac 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -69,10 +69,10 @@ } #define NEIGHBOR_ADD_CMD "neighbor " -#define NEIGHBOR_DEL_CMD "neighbor del " +#define NEIGHBOR_DEL_CMD "no neighbor " #define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n" #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add " -#define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" +#define NEIGHBOR_DEL_DOC NO_STR "Remove local or remote-BSS neighbor cell\n" #define LAC_PARAMS "lac <0-65535>" #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 644e330..8de34d6 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -86,8 +86,8 @@ neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor 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) + no neighbor bts <0-255> + no neighbor arfcn <0-1023> bsic (<0-63>|any) ... OsmoBSC(config-net-bts)# neighbor? @@ -98,7 +98,6 @@ lac Add Neighbor cell by LAC lac-ci Add Neighbor cell by LAC and CI cgi Add Neighbor cell by cgi - del Remove local or remote-BSS neighbor cell OsmoBSC(config-net-bts)# neighbor bts ? <0-255> BTS number @@ -157,23 +156,26 @@ OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ? -OsmoBSC(config-net-bts)# neighbor del ? +OsmoBSC(config-net-bts)# no neighbor? + neighbor Remove local or remote-BSS neighbor cell + +OsmoBSC(config-net-bts)# no neighbor ? bts Neighbor cell by local BTS number arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor del bts ? +OsmoBSC(config-net-bts)# no neighbor bts ? <0-255> BTS number -OsmoBSC(config-net-bts)# neighbor del bts 0 ? +OsmoBSC(config-net-bts)# no neighbor bts 0 ? -OsmoBSC(config-net-bts)# neighbor del arfcn ? +OsmoBSC(config-net-bts)# no neighbor arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor del arfcn 0 ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic 0 ? OsmoBSC(config-net-bts)# show running-config @@ -257,10 +259,10 @@ OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23 % neighbor lac-ci 789 10 arfcn 423 bsic 23 -OsmoBSC(config-net-bts)# neighbor del arfcn 99 bsic 7 +OsmoBSC(config-net-bts)# no neighbor arfcn 99 bsic 7 % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7 -OsmoBSC(config-net-bts)# neighbor del arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# no neighbor arfcn 23 bsic 42 % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config @@ -273,7 +275,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 123 bsic 45 +OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45 % Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45 OsmoBSC(config-net-bts)# show running-config @@ -285,7 +287,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any % Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC) OsmoBSC(config-net-bts)# show running-config @@ -296,7 +298,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63 +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config @@ -306,7 +308,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 1 +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config @@ -315,7 +317,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any % Removed local neighbor bts 0 to bts 1 OsmoBSC(config-net-bts)# show running-config @@ -323,7 +325,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any % Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC) OsmoBSC(config-net-bts)# show running-config @@ -331,7 +333,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 +OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12 % Removed local neighbor bts 0 to bts 2 OsmoBSC(config-net-bts)# show running-config -- To view, visit https://gerrit.osmocom.org/11125 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: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 Gerrit-Change-Number: 11125 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 Thu Sep 27 19:57:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:22 +0000 Subject: Change in osmo-bsc[master]: neighbor vty: allow setting local neighbors by CGI In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11126 ) Change subject: neighbor vty: allow setting local neighbors by CGI ...................................................................... neighbor vty: allow setting local neighbors by CGI Add missing item in the landscape of VTY commands: allow identifying a local cell by CGI (besides BTS nr, LAC or LAC+CI, which already exist). Change-Id: I2d03de6b695904c4a86025bf250358d04f6e47de --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 18 insertions(+), 2 deletions(-) Approvals: Harald Welte: 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 70240ac..d0c23a8 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -80,6 +80,9 @@ #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 CGI_PARAMS "cgi <0-999> <0-999> <0-65535> <0-65535>" +#define CGI_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\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" @@ -235,6 +238,13 @@ return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv))); } +DEFUN(cfg_neighbor_add_cgi, cfg_neighbor_add_cgi_cmd, + NEIGHBOR_ADD_CMD CGI_PARAMS, + NEIGHBOR_ADD_DOC CGI_DOC) +{ + return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_cgi(vty, argv))); +} + bool neighbor_ident_key_matches_bts(const struct neighbor_ident_key *key, struct gsm_bts *bts) { if (!bts || !key) @@ -379,8 +389,8 @@ } 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-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) + NEIGHBOR_ADD_CMD CGI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_DOC CGI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_cgi(vty, argv); @@ -552,6 +562,7 @@ install_element(BTS_NODE, &cfg_neighbor_add_bts_nr_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_ci_cmd); + install_element(BTS_NODE, &cfg_neighbor_add_cgi_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_arfcn_bsic_cmd); install_element(BTS_NODE, &cfg_neighbor_add_lac_ci_arfcn_bsic_cmd); install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd); diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 8de34d6..02b0f50 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -83,6 +83,7 @@ neighbor bts <0-255> neighbor lac <0-65535> neighbor lac-ci <0-65535> <0-65535> + neighbor cgi <0-999> <0-999> <0-65535> <0-65535> neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) @@ -146,6 +147,7 @@ <0-65535> CI OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 ? arfcn ARFCN of neighbor cell + OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn ? <0-1023> ARFCN value OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 ? @@ -196,6 +198,9 @@ OsmoBSC(config-net-bts)# neighbor lac 22 % BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 +OsmoBSC(config-net-bts)# no neighbor bts 2 +OsmoBSC(config-net-bts)# neighbor cgi 901 70 22 65535 +% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 OsmoBSC(config-net-bts)# neighbor 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 -- To view, visit https://gerrit.osmocom.org/11126 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: I2d03de6b695904c4a86025bf250358d04f6e47de Gerrit-Change-Number: 11126 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 Thu Sep 27 19:57:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 19:57:23 +0000 Subject: Change in osmo-bsc[master]: vty: write local neighbors by bts nr, not lac-ci In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11127 ) Change subject: vty: write local neighbors by bts nr, not lac-ci ...................................................................... vty: write local neighbors by bts nr, not lac-ci Change-Id: I35783f9624eacbdffccdb59a0179ffda54a26990 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 15 insertions(+), 17 deletions(-) Approvals: Harald Welte: 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 d0c23a8..409153b 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -495,9 +495,7 @@ struct gsm_bts_ref *neigh; llist_for_each_entry(neigh, &bts->local_neighbors, entry) { - vty_out(vty, "%sneighbor lac-ci %u %u%s", - indent, neigh->bts->location_area_code, neigh->bts->cell_identity, - VTY_NEWLINE); + vty_out(vty, "%sneighbor bts %u%s", indent, neigh->bts->nr, VTY_NEWLINE); } } diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 02b0f50..4f86383 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -241,8 +241,8 @@ ... !neighbor bts 0 ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor cgi 023 42 423 5 arfcn 23 bsic 42 neighbor cgi 023 042 423 6 arfcn 23 bsic 42 neighbor cgi 023 042 234 56 arfcn 23 bsic 42 @@ -272,8 +272,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac 456 arfcn 123 bsic 45 neighbor lac-ci 789 10 arfcn 423 bsic any neighbor lac-ci 789 10 arfcn 423 bsic 63 @@ -285,8 +285,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic any neighbor lac-ci 789 10 arfcn 423 bsic 63 neighbor lac-ci 789 10 arfcn 423 bsic 1 @@ -297,8 +297,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic 63 neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor @@ -308,8 +308,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor @@ -318,8 +318,8 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 21 31 - neighbor lac-ci 22 65535 + neighbor bts 1 + neighbor bts 2 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any @@ -327,7 +327,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 22 65535 + neighbor bts 2 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any @@ -335,7 +335,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor - neighbor lac-ci 22 65535 + neighbor bts 2 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12 -- To view, visit https://gerrit.osmocom.org/11127 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: I35783f9624eacbdffccdb59a0179ffda54a26990 Gerrit-Change-Number: 11127 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 Thu Sep 27 20:02:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:02:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11135 Change subject: osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' ...................................................................... osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' Adjust for osmo-bsc change I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8. Change-Id: I6a83a8d4ba61b87905c6fae457d4b4eb6078dce9 --- M bsc/osmo-bsc.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/11135/1 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 724d567..c7f34fc 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -89,7 +89,7 @@ ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 # remote-BSS neighbor: - neighbor add lac 99 arfcn 123 bsic any + neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 -- To view, visit https://gerrit.osmocom.org/11135 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: I6a83a8d4ba61b87905c6fae457d4b4eb6078dce9 Gerrit-Change-Number: 11135 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 20:16:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 27 Sep 2018 20:16:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW 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/11083 to look at the new patch set (#3). Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... bts: Add module parameters with tolerance to support real HW When we don't use trxcon (ie we run real HW) we cannot set some parameters like ms power level, so we need to relax template matching when we receive UL measurements in that case. This commit makes tests TC_meas_res_sign_tchf and TC_meas_res_sign_tchh_toa256 pass with motorola CXX and osmo-trx+osmo-bts-trx. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn M library/GSM_Types.ttcn M library/L1CTL_Types.ttcn 3 files changed, 65 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11083/3 -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 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 Thu Sep 27 20:19:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 27 Sep 2018 20:19:33 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... Patch Set 3: (2 comments) Don't get my hypercriticism wrong please ;) https://gerrit.osmocom.org/#/c/11132/3/utils/osmo-config-merge.c File utils/osmo-config-merge.c: https://gerrit.osmocom.org/#/c/11132/3/utils/osmo-config-merge.c at 130 PS3, Line 130: read I think "Could not open ..." would be a bit more informative. Additionally, printing: "Could not open file '%s': (rc=%d) %s\n" % (fname, rc, strerror(errno)) would make this message even more informative. https://gerrit.osmocom.org/#/c/11132/3/utils/osmo-config-merge.c at 236 PS3, Line 236: Not sure we need this white space. Let's just remove this chunk without replacing it with empty lines... -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 27 Sep 2018 20:19:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 20:20:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 27 Sep 2018 20:20:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 3: Verified-1 This patch is still WIP, not ready to merge. In last version I fixed some of the comments, and attempted at fixing the cause of varying ms_power_level 0<->7 by: * Setting the dummy meas rep in l1 by calling f_L1CTL_PARAM() * Avoid harcoding ms_power_level=0 (And whole SACCH L1 Header = 0) in as_l1_sacch(). Last change however is still not working fine, message seems to be built with some errors as it says it sees fpc=true at receive time, while it is cleary generated with fpc=false before sending: "BTS_Tests.ttcn:1302 Matching on port RSL .ies[4].body.l1_info.fpc := true with false unmatched: First message in the queue does not match the template" -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 27 Sep 2018 20: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 Thu Sep 27 20:23:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:23:24 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 20:23:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 20:23:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:23:45 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Patch Set 3: Code-Review+2 ready now -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 20:23:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 20:25:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:25:09 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 27 Sep 2018 20:25: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 Sep 27 20:25:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:25:12 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11042 ) Change subject: osmo-bsc.cfg: inter-bsc HO: add a neighbor identity ...................................................................... osmo-bsc.cfg: inter-bsc HO: add a neighbor identity This mirrors osmo-ttcn3-hacks change: "bsc: inter-BSC HO: add TC_ho_out_of_this_bsc, TC_ho_into_this_bsc" change-id Id22852d4be7f127d827e7a8beeec55db27c07f03 (As well as removal of the 'add' keyword in change-id I6a83a8d4ba61b87905c6fae457d4b4eb6078dce9 after osmo-bsc change I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8.) Related: OS#2283 Change-Id: I077c2ad2ede900ec43f55655bd740651d3bbe83d --- M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 4249818..21ef4b9 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -93,6 +93,8 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 + # remote-BSS neighbor: + neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 4914607..25844b4 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -103,6 +103,8 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 + # remote-BSS neighbor: + neighbor lac 99 arfcn 123 bsic any codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 -- To view, visit https://gerrit.osmocom.org/11042 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: I077c2ad2ede900ec43f55655bd740651d3bbe83d Gerrit-Change-Number: 11042 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 27 20:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:26:59 +0000 Subject: Change in osmo-sgsn[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11107 ) Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: Ie267aa014812b5c89f2268a65566d5427aa1ad7e --- M src/gprs/sgsn_main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index feffefb..11ed5d3 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -400,6 +400,7 @@ #if BUILD_IU osmo_ss7_init(); osmo_ss7_vty_init_asp(tall_bsc_ctx); + osmo_sccp_vty_init(); #endif handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/11107 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: Ie267aa014812b5c89f2268a65566d5427aa1ad7e Gerrit-Change-Number: 11107 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 Sep 27 20:27:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 27 Sep 2018 20:27:07 +0000 Subject: Change in osmo-msc[master]: vty: add SCCP related vty commands In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11106 ) Change subject: vty: add SCCP related vty commands ...................................................................... vty: add SCCP related vty commands Depends: I214ea51fc6bfa2a9a4dd7c34b43add0c77ffe22e (libosmo-sccp) Change-Id: I245b153785f615b998bb5279cb8d93787d57b4b7 --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 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 f87a95e..53d27d3 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -543,6 +543,7 @@ osmo_ss7_init(); osmo_ss7_vty_init_asp(tall_msc_ctx); + osmo_sccp_vty_init(); /* Parse options */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/11106 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: I245b153785f615b998bb5279cb8d93787d57b4b7 Gerrit-Change-Number: 11106 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 Sep 27 21:06:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 21:06:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11135 ) Change subject: osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11135 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: I6a83a8d4ba61b87905c6fae457d4b4eb6078dce9 Gerrit-Change-Number: 11135 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 27 Sep 2018 21: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 Thu Sep 27 21:06:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 27 Sep 2018 21:06:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11135 ) Change subject: osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' ...................................................................... osmo-bsc.cfg: drop 'add' keyword from 'neighbor add' Adjust for osmo-bsc change I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8. Change-Id: I6a83a8d4ba61b87905c6fae457d4b4eb6078dce9 --- M bsc/osmo-bsc.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 724d567..c7f34fc 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -89,7 +89,7 @@ ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 # remote-BSS neighbor: - neighbor add lac 99 arfcn 123 bsic any + neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 -- To view, visit https://gerrit.osmocom.org/11135 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: I6a83a8d4ba61b87905c6fae457d4b4eb6078dce9 Gerrit-Change-Number: 11135 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 Sep 28 01:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 01:30:02 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan state to sched_prim_dequeue() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11136 Change subject: trxcon/scheduler: pass lchan state to sched_prim_dequeue() ...................................................................... trxcon/scheduler: pass lchan state to sched_prim_dequeue() Having access to a logical channel state is required by the follow-up change, which will introduce a separate function for dequeuing SACCH primitives. Change-Id: Ibde0acf8e6be224b1007be707a636eaad68c8d36 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/11136/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 6b160d1..e71109b 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -284,17 +284,17 @@ * * @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 + * @param lchan logical channel state * @return a primitive or NULL if not found */ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, - uint32_t fn, enum trx_lchan_type lchan_type) + uint32_t fn, struct trx_lchan_state *lchan) { /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; - switch (lchan_type) { + switch (lchan->type) { /* TCH/F requires FACCH/F prioritization */ case TRXC_TCHF: return prim_dequeue_tch_f(queue); @@ -302,11 +302,11 @@ /* 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); + return prim_dequeue_tch_h(queue, fn, lchan->type); /* Other kinds of logical channels */ default: - return prim_dequeue_one(queue, lchan_type); + return prim_dequeue_one(queue, lchan->type); } } diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 023764d..fc29998 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, fn, chan); + lchan->prim = sched_prim_dequeue(&ts->tx_prims, fn, lchan); /* 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 08e2489..ff288f2 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, - uint32_t fn, enum trx_lchan_type lchan_type); + uint32_t fn, struct trx_lchan_state *lchan); 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/11136 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: Ibde0acf8e6be224b1007be707a636eaad68c8d36 Gerrit-Change-Number: 11136 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 01:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 01:30:02 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11137 Change subject: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() ...................................................................... trxcon/scheduler: pass talloc ctx directly to sched_prim_init() Enforcing pointer to a 'trx_instance' structure is not flexible, because it is used as parent talloc context only. Change-Id: I5ab2ef5cea76f955bf72ef54541b3b75cdc2d23f --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.h 2 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/11137/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e71109b..e03f93f 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -42,16 +42,15 @@ * Initializes a new primitive by allocating memory * and filling some meta-information (e.g. lchan type). * - * @param trx TRX instance to be used as initial talloc context + * @param ctx parent talloc context * @param prim external prim pointer (will point to the allocated prim) * @param pl_len prim payload length * @param chan_nr RSL channel description (used to set a proper chan) * @param link_id RSL link description (used to set a proper chan) * @return zero in case of success, otherwise a error number */ -int sched_prim_init(struct trx_instance *trx, - struct trx_ts_prim **prim, size_t pl_len, - uint8_t chan_nr, uint8_t link_id) +int sched_prim_init(void *ctx, struct trx_ts_prim **prim, + size_t pl_len, uint8_t chan_nr, uint8_t link_id) { enum trx_lchan_type lchan_type; struct trx_ts_prim *new_prim; @@ -70,7 +69,7 @@ len += pl_len; /* Requested payload size */ /* Allocate a new primitive */ - new_prim = talloc_zero_size(trx, len); + new_prim = talloc_zero_size(ctx, len); if (new_prim == NULL) { LOGP(DSCH, LOGL_ERROR, "Failed to allocate memory\n"); return -ENOMEM; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index ff288f2..818c95a 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -273,7 +273,7 @@ enum trx_lchan_type chan); /* Primitive management functions */ -int sched_prim_init(struct trx_instance *trx, struct trx_ts_prim **prim, +int sched_prim_init(void *ctx, struct trx_ts_prim **prim, size_t pl_len, uint8_t chan_nr, uint8_t link_id); int sched_prim_push(struct trx_instance *trx, struct trx_ts_prim *prim, uint8_t chan_nr); -- To view, visit https://gerrit.osmocom.org/11137 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: I5ab2ef5cea76f955bf72ef54541b3b75cdc2d23f Gerrit-Change-Number: 11137 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 01:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 01:30:02 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11138 Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... trxcon/scheduler: fix Measurement Reporting on SACCH According to 3GPP TS 04.08, section 3.4.1, SACCH logical channel accompanies either a traffic or a signaling channel. It has the particularity that continuous transmission must occur in both directions, so on the Uplink direction measurement result messages are sent at each possible occasion when nothing else has to be sent. The LAPDm fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not applicable on SACCH channels! Unfortunately, 3GPP TS 04.08 doesn't clearly state which "else messages" besides Measurement Reports can be send by the MS on SACCH channels. However, in sub-clause 3.4.1 it's stated that the interval between two successive measurement result messages shall not exceed one L2 frame. This change introduces a separate handler for SACCH primitives, which dequeues a SACCH primitive from transmit queue, if present. Otherwise it dequeues a cached Measurement Report (the last received one). Finally, if the cache is empty, a "dummy" measurement report is used. When it's possible, a non-MR primitive is prioritized. Change-Id: If1b8dc74ced746d6270676fdde75fcda32f91a3d Related: OS#2988 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 197 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/11138/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e03f93f..0f3258f 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -126,6 +126,180 @@ return 0; } +/** + * Composes a new primitive using either cached (if populated), + * or "dummy" Measurement Report message. + * + * @param lchan lchan to assign a primitive + * @return SACCH primitive to be transmitted + */ +static struct trx_ts_prim *prim_compose_mr(struct trx_lchan_state *lchan) +{ + struct trx_ts_prim *prim; + uint8_t *mr_src_ptr; + bool cached; + int rc; + + /* "Dummy" Measurement Report */ + static const uint8_t meas_rep_dummy[] = { + /* L1 SACCH pseudo-header */ + 0x0f, 0x00, + + /* LAPDm header */ + 0x01, 0x03, 0x49, + + /* Measurement report */ + 0x06, 0x15, 0x36, 0x36, 0x01, 0xC0, + + /* TODO: Padding? Randomize if so */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; + + /* Allocate a new primitive */ + rc = sched_prim_init(lchan, &prim, GSM_MACBLOCK_LEN, + trx_lchan_desc[lchan->type].chan_nr, TRX_CH_LID_SACCH); + OSMO_ASSERT(rc == 0); + + /* Check if the MR cache is populated (verify LAPDm header) */ + cached = (lchan->sacch.mr_cache[2] != 0x00 + && lchan->sacch.mr_cache[3] != 0x00 + && lchan->sacch.mr_cache[4] != 0x00); + if (cached) { /* Use the cached one */ + mr_src_ptr = lchan->sacch.mr_cache; + lchan->sacch.mr_cache_usage++; + } else { /* Use "dummy" one */ + mr_src_ptr = (uint8_t *) meas_rep_dummy; + } + + /* Compose a new Measurement Report primitive */ + memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN); + +#if 0 /* Conflicts with the distance spoofing feature */ + /* Update L1 SACCH pseudo-header */ + prim->payload[0] = trx->tx_power; + prim->payload[1] = trx->ta; +#endif + + /* Inform about the cache usage count */ + if (cached && lchan->sacch.mr_cache_usage > 5) { + LOGP(DSCHD, LOGL_NOTICE, "SACCH MR cache usage count=%u > 5 " + "on lchan=%s => ancient measurements, please fix!\n", + lchan->sacch.mr_cache_usage, + trx_lchan_desc[lchan->type].name); + } + + LOGP(DSCHD, LOGL_NOTICE, "Transmitting a %s Measurement Report " + "on lchan=%s\n", (cached ? "cached" : "dummy"), + trx_lchan_desc[lchan->type].name); + + return prim; +} + +/** + * Dequeues a SACCH primitive from transmit queue, if present. + * Otherwise dequeues a cached Measurement Report (the last + * received one). Finally, if the cache is empty, a "dummy" + * measurement report is used. + * + * According to 3GPP TS 04.08, section 3.4.1, SACCH channel + * accompanies either a traffic or a signaling channel. It + * has the particularity that continuous transmission must + * occur in both directions, so on the Uplink direction + * measurement result messages are sent at each possible + * occasion when nothing else has to be sent. The LAPDm + * fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not + * applicable on SACCH channels! + * + * Unfortunately, 3GPP TS 04.08 doesn't clearly state + * which "else messages" besides Measurement Reports + * can be send by the MS on SACCH channels. However, + * in sub-clause 3.4.1 it's stated that the interval + * between two successive measurement result messages + * shall not exceed one L2 frame. + * + * @param queue transmit queue to take a prim from + * @param lchan lchan to assign a primitive + * @return SACCH primitive to be transmitted + */ +static struct trx_ts_prim *prim_dequeue_sacch(struct llist_head *queue, + struct trx_lchan_state *lchan) +{ + struct trx_ts_prim *prim_nmr = NULL; + struct trx_ts_prim *prim_mr = NULL; + struct trx_ts_prim *prim; + bool mr_now; + + /* Shall we transmit MR now? */ + mr_now = !lchan->sacch.mr_tx_last; + +#define PRIM_IS_MR(prim) \ + (prim->payload[5] == GSM48_PDISC_RR \ + && prim->payload[6] == GSM48_MT_RR_MEAS_REP) + + /* Iterate over all primitives in the queue */ + llist_for_each_entry(prim, queue, list) { + /* We are looking for particular channel */ + if (prim->chan != lchan->type) + continue; + + /* Just to be sure... */ + if (prim->payload_len != GSM_MACBLOCK_LEN) + continue; + + /* Look for a Measurement Report */ + if (!prim_mr && PRIM_IS_MR(prim)) + prim_mr = prim; + + /* Look for anything else */ + if (!prim_nmr && !PRIM_IS_MR(prim)) + prim_nmr = prim; + + /* Should we look further? */ + if (mr_now && prim_mr) + break; /* MR was found */ + else if (!mr_now && prim_nmr) + break; /* something else was found */ + } + + LOGP(DSCHD, LOGL_DEBUG, "SACCH MR selection on lchan=%s: " + "mr_tx_last=%d prim_mr=%p prim_nmr=%p\n", + trx_lchan_desc[lchan->type].name, + lchan->sacch.mr_tx_last, + prim_mr, prim_nmr); + + /* Prioritize non-MR prim if possible */ + if (mr_now && prim_mr) + prim = prim_mr; + else if (!mr_now && prim_nmr) + prim = prim_nmr; + else if (!mr_now && prim_mr) + prim = prim_mr; + else /* Nothing was found */ + prim = NULL; + + /* Have we found what we were looking for? */ + if (prim) /* Dequeue if so */ + llist_del(&prim->list); + else /* Otherwise compose a new MR */ + prim = prim_compose_mr(lchan); + + /* Update the cached report */ + if (prim == prim_mr) { + memcpy(lchan->sacch.mr_cache, + prim->payload, GSM_MACBLOCK_LEN); + lchan->sacch.mr_cache_usage = 0; + + LOGP(DSCHD, LOGL_DEBUG, "SACCH MR cache has been updated " + "for lchan=%s\n", trx_lchan_desc[lchan->type].name); + } + + /* Update the MR transmission state */ + lchan->sacch.mr_tx_last = PRIM_IS_MR(prim); + + return prim; +} + /* 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) @@ -289,6 +463,10 @@ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, uint32_t fn, struct trx_lchan_state *lchan) { + /* SACCH is unorthodox, see 3GPP TS 04.08, section 3.4.1 */ + if (CHAN_IS_SACCH(lchan->type)) + return prim_dequeue_sacch(queue, lchan); + /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; @@ -350,6 +528,8 @@ /* Make sure that there is no existing primitive */ OSMO_ASSERT(lchan->prim == NULL); + /* Not applicable for SACCH! */ + OSMO_ASSERT(!CHAN_IS_SACCH(lchan->type)); /** * Determine what actually should be generated: @@ -364,18 +544,8 @@ /* FIXME: should we do anything for CSD? */ return 0; } else { - uint8_t *cur = prim_buffer; - - if (CHAN_IS_SACCH(chan)) { - /* Add 2-byte SACCH header */ - /* FIXME: How to get TA and MS Tx Power from l1l->trx->tx_power + l1l->trx->ta? */ - cur[0] = cur[1] = 0x00; - cur += 2; - } - - /* Copy a fill frame payload */ - memcpy(cur, lapdm_fill_frame, sizeof(lapdm_fill_frame)); - cur += sizeof(lapdm_fill_frame); + /* Copy LAPDm fill frame's header */ + memcpy(prim_buffer, lapdm_fill_frame, sizeof(lapdm_fill_frame)); /** * TS 144.006, section 5.2 "Frame delimitation and fill bits" @@ -383,7 +553,7 @@ * be set to the binary value "00101011", each fill bit should * be set to a random value when sent by the network. */ - for (i = cur - prim_buffer; i < GSM_MACBLOCK_LEN; i++) + for (i = sizeof(lapdm_fill_frame); i < GSM_MACBLOCK_LEN; i++) prim_buffer[i] = (uint8_t) rand(); /* Define a prim length */ diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index fc29998..0b83af3 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -460,7 +460,7 @@ /* Forget the current prim */ sched_prim_drop(lchan); - /* TCH specific variables */ + /* Channel specific stuff */ if (CHAN_IS_TCH(lchan->type)) { lchan->dl_ongoing_facch = 0; lchan->ul_facch_blocks = 0; @@ -469,6 +469,9 @@ /* Reset AMR state */ memset(&lchan->amr, 0x00, sizeof(lchan->amr)); + } else if (CHAN_IS_SACCH(lchan->type)) { + /* Reset SACCH state */ + memset(&lchan->sacch, 0x00, sizeof(lchan->sacch)); } /* Reset ciphering state */ diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 818c95a..0feaeec 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -186,6 +186,16 @@ int32_t toa256_sum; } meas; + /*! \brief SACCH state */ + struct { + /*! \brief Cached measurement report (last received) */ + uint8_t mr_cache[GSM_MACBLOCK_LEN]; + /*! \brief Cache usage counter */ + uint8_t mr_cache_usage; + /*! \brief What MR transmitted last time? */ + uint8_t mr_tx_last; /*!< 0x01 - yes, 0x00 - no */ + } sacch; + /* AMR specific */ struct { /*! \brief 4 possible codecs for AMR */ -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 01:31:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 01:31:00 +0000 Subject: Change in osmocom-bb[fixeria/trx]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/7470 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Abandoned See https://gerrit.osmocom.org/11138/ -- To view, visit https://gerrit.osmocom.org/7470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: fixeria/trx Gerrit-MessageType: abandon Gerrit-Change-Id: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 7470 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Fri Sep 28 01:33:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 01:33:32 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH 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/11138 to look at the new patch set (#2). Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... trxcon/scheduler: fix Measurement Reporting on SACCH According to 3GPP TS 04.08, section 3.4.1, SACCH logical channel accompanies either a traffic or a signaling channel. It has the particularity that continuous transmission must occur in both directions, so on the Uplink direction measurement result messages are sent at each possible occasion when nothing else has to be sent. The LAPDm fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not applicable on SACCH channels! Unfortunately, 3GPP TS 04.08 doesn't clearly state which "else messages" besides Measurement Reports can be send by the MS on SACCH channels. However, in sub-clause 3.4.1 it's stated that the interval between two successive measurement result messages shall not exceed one L2 frame. This change introduces a separate handler for SACCH primitives, which dequeues a SACCH primitive from transmit queue, if present. Otherwise it dequeues a cached Measurement Report (the last received one). Finally, if the cache is empty, a "dummy" measurement report is used. When it's possible, a non-MR primitive is prioritized. Change-Id: If1b8dc74ced746d6270676fdde75fcda32f91a3d Related: OS#2988 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 197 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/11138/2 -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 28 09:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 28 Sep 2018 09:04:54 +0000 Subject: Change in osmo-msc[master]: mncc: fix byte ordering of IP-Address in mncc Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11139 Change subject: mncc: fix byte ordering of IP-Address in mncc ...................................................................... mncc: fix byte ordering of IP-Address in mncc At the moment osmo-msc populates the member ip in struct gsm_mncc_rtp with the wrong byte ordering. This causes LCR or osmo-sip-connector to receive the IP address in the wrong order, which eventually leads into a reversed IP address in the SDP part of the SIP messages. Change-Id: I86148179b549b511528e4c65213eb6c204cc609e Related: OS#3431 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/11139/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 2c17e22..19e6cba 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1606,7 +1606,7 @@ rtp->callref = callref; rtp->msg_type = cmd; - rtp->ip = addr; + rtp->ip = osmo_htonl(addr); rtp->port = port; rtp->payload_type = payload_type; rtp->payload_msg_type = payload_msg_type; -- To view, visit https://gerrit.osmocom.org/11139 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: I86148179b549b511528e4c65213eb6c204cc609e Gerrit-Change-Number: 11139 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 09:41:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 09:41:13 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan state to sched_prim_dequeue() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11136 ) Change subject: trxcon/scheduler: pass lchan state to sched_prim_dequeue() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11136 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: Ibde0acf8e6be224b1007be707a636eaad68c8d36 Gerrit-Change-Number: 11136 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 09:41: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 Sep 28 09:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 09:41:52 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11137 ) Change subject: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11137 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: I5ab2ef5cea76f955bf72ef54541b3b75cdc2d23f Gerrit-Change-Number: 11137 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 09:41: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 Sep 28 09:42:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 09:42:30 +0000 Subject: Change in osmo-msc[master]: mncc: fix byte ordering of IP-Address in mncc In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11139 ) Change subject: mncc: fix byte ordering of IP-Address in mncc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11139 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: I86148179b549b511528e4c65213eb6c204cc609e Gerrit-Change-Number: 11139 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 09:42: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 Sep 28 09:52:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:52:18 +0000 Subject: Change in osmo-msc[master]: mncc: fix byte ordering of IP-Address in mncc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11139 ) Change subject: mncc: fix byte ordering of IP-Address in mncc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11139 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: I86148179b549b511528e4c65213eb6c204cc609e Gerrit-Change-Number: 11139 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 09:52: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 Sep 28 09:52:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:52:19 +0000 Subject: Change in osmo-msc[master]: mncc: fix byte ordering of IP-Address in mncc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11139 ) Change subject: mncc: fix byte ordering of IP-Address in mncc ...................................................................... mncc: fix byte ordering of IP-Address in mncc At the moment osmo-msc populates the member ip in struct gsm_mncc_rtp with the wrong byte ordering. This causes LCR or osmo-sip-connector to receive the IP address in the wrong order, which eventually leads into a reversed IP address in the SDP part of the SIP messages. Change-Id: I86148179b549b511528e4c65213eb6c204cc609e Related: OS#3431 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) 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/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 2c17e22..19e6cba 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1606,7 +1606,7 @@ rtp->callref = callref; rtp->msg_type = cmd; - rtp->ip = addr; + rtp->ip = osmo_htonl(addr); rtp->port = port; rtp->payload_type = payload_type; rtp->payload_msg_type = payload_msg_type; -- To view, visit https://gerrit.osmocom.org/11139 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: I86148179b549b511528e4c65213eb6c204cc609e Gerrit-Change-Number: 11139 Gerrit-PatchSet: 1 Gerrit-Owner: dexter 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 Fri Sep 28 09:53:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:53:09 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan state to sched_prim_dequeue() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11136 ) Change subject: trxcon/scheduler: pass lchan state to sched_prim_dequeue() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11136 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: Ibde0acf8e6be224b1007be707a636eaad68c8d36 Gerrit-Change-Number: 11136 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 09:53: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 Sep 28 09:53:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:53:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11137 ) Change subject: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11137 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: I5ab2ef5cea76f955bf72ef54541b3b75cdc2d23f Gerrit-Change-Number: 11137 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 09:53:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 09:54:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:54:52 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 143 PS2, Line 143: "Dummy" Measurement Report should the L1 SACCH header even of the dummy not contain the actual MS power level that is used / that was last sent from L2 via L1CTL? -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 09:54:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 09:54:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:54:55 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan state to sched_prim_dequeue() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11136 ) Change subject: trxcon/scheduler: pass lchan state to sched_prim_dequeue() ...................................................................... trxcon/scheduler: pass lchan state to sched_prim_dequeue() Having access to a logical channel state is required by the follow-up change, which will introduce a separate function for dequeuing SACCH primitives. Change-Id: Ibde0acf8e6be224b1007be707a636eaad68c8d36 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 6b160d1..e71109b 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -284,17 +284,17 @@ * * @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 + * @param lchan logical channel state * @return a primitive or NULL if not found */ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, - uint32_t fn, enum trx_lchan_type lchan_type) + uint32_t fn, struct trx_lchan_state *lchan) { /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; - switch (lchan_type) { + switch (lchan->type) { /* TCH/F requires FACCH/F prioritization */ case TRXC_TCHF: return prim_dequeue_tch_f(queue); @@ -302,11 +302,11 @@ /* 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); + return prim_dequeue_tch_h(queue, fn, lchan->type); /* Other kinds of logical channels */ default: - return prim_dequeue_one(queue, lchan_type); + return prim_dequeue_one(queue, lchan->type); } } diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 023764d..fc29998 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, fn, chan); + lchan->prim = sched_prim_dequeue(&ts->tx_prims, fn, lchan); /* 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 08e2489..ff288f2 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, - uint32_t fn, enum trx_lchan_type lchan_type); + uint32_t fn, struct trx_lchan_state *lchan); 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/11136 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: Ibde0acf8e6be224b1007be707a636eaad68c8d36 Gerrit-Change-Number: 11136 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Fri Sep 28 09:54:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:54:55 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11137 ) Change subject: trxcon/scheduler: pass talloc ctx directly to sched_prim_init() ...................................................................... trxcon/scheduler: pass talloc ctx directly to sched_prim_init() Enforcing pointer to a 'trx_instance' structure is not flexible, because it is used as parent talloc context only. Change-Id: I5ab2ef5cea76f955bf72ef54541b3b75cdc2d23f --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.h 2 files changed, 5 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e71109b..e03f93f 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -42,16 +42,15 @@ * Initializes a new primitive by allocating memory * and filling some meta-information (e.g. lchan type). * - * @param trx TRX instance to be used as initial talloc context + * @param ctx parent talloc context * @param prim external prim pointer (will point to the allocated prim) * @param pl_len prim payload length * @param chan_nr RSL channel description (used to set a proper chan) * @param link_id RSL link description (used to set a proper chan) * @return zero in case of success, otherwise a error number */ -int sched_prim_init(struct trx_instance *trx, - struct trx_ts_prim **prim, size_t pl_len, - uint8_t chan_nr, uint8_t link_id) +int sched_prim_init(void *ctx, struct trx_ts_prim **prim, + size_t pl_len, uint8_t chan_nr, uint8_t link_id) { enum trx_lchan_type lchan_type; struct trx_ts_prim *new_prim; @@ -70,7 +69,7 @@ len += pl_len; /* Requested payload size */ /* Allocate a new primitive */ - new_prim = talloc_zero_size(trx, len); + new_prim = talloc_zero_size(ctx, len); if (new_prim == NULL) { LOGP(DSCH, LOGL_ERROR, "Failed to allocate memory\n"); return -ENOMEM; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index ff288f2..818c95a 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -273,7 +273,7 @@ enum trx_lchan_type chan); /* Primitive management functions */ -int sched_prim_init(struct trx_instance *trx, struct trx_ts_prim **prim, +int sched_prim_init(void *ctx, struct trx_ts_prim **prim, size_t pl_len, uint8_t chan_nr, uint8_t link_id); int sched_prim_push(struct trx_instance *trx, struct trx_ts_prim *prim, uint8_t chan_nr); -- To view, visit https://gerrit.osmocom.org/11137 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: I5ab2ef5cea76f955bf72ef54541b3b75cdc2d23f Gerrit-Change-Number: 11137 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Fri Sep 28 09:58:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 09:58:19 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11133 ) Change subject: osmo-config-merge: Add manual page ...................................................................... Patch Set 3: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11133/3/configure.ac File configure.ac: https://gerrit.osmocom.org/#/c/11133/3/configure.ac at 87 PS3, Line 87: [AC_MSG_ERROR([a2x not found, please install asciidoc])]) makes sense to state "or use --disable-man-doc" here https://gerrit.osmocom.org/#/c/11133/3/man/Makefile.am File man/Makefile.am: https://gerrit.osmocom.org/#/c/11133/3/man/Makefile.am at 9 PS3, Line 9: osmo-config-merge.8 : ${ASCIIDOCS} So the left hand side (target) is for one man page explicitly (osmo-config-merge.8) while on the right hand side (dependencies) we list all ASCIIDOC manpages. Currently this works. But what if there are going to be more man pages? I think it makes sense to have a general rule like %.8: %.txt or actually even better %.8: %.adoc (to make sure editors know its an asciidoc file). https://gerrit.osmocom.org/#/c/11133/3/man/osmo-config-merge.txt File man/osmo-config-merge.txt: https://gerrit.osmocom.org/#/c/11133/3/man/osmo-config-merge.txt at 62 PS3, Line 62: osmo-config-merge was written by Harald Welte Debian always lists who wrote the man page here, too. So give yourself some credit :) -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 09:58: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 Sep 28 10:09:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:09:19 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: Code-Review-1 (5 comments) I expect a similar patch for l23_api/l1 firmware as there's some similar code there, right? https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 180 PS2, Line 180: prim->payload[0] = trx->tx_power; I think this should be done (without if 0) in line 172, in the dummy meas rep case. https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 192 PS2, Line 192: LOGP(DSCHD, LOGL_NOTICE, "Transmitting a %s Measurement Report " We are not transmitting here. Maybe Using? Retrieving? https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 234 PS2, Line 234: mr_now = !lchan->sacch.mr_tx_last; With this toggle and above coment from "sub-clause 3.4.1" I understand there's 2 SACCH slots per L2 frame. Am I right? https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 259 PS2, Line 259: if (mr_now && prim_mr) This if-else clause can be merged into previous 2 ifs, and it's way clear imho. if (!prim_mr && PRIM_IS_MR(prim)) { prim_mr = prim; if (mr_now) break; } I think you can even drop the prim_mr and !prim_nmr and directly ubreak and use prim after the loop. https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_trx.h File src/host/trxcon/sched_trx.h: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_trx.h at 196 PS2, Line 196: uint8_t mr_tx_last; /*!< 0x01 - yes, 0x00 - no */ why not using a bool here? -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:09: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 Sep 28 10:14:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:14:55 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at a372 PS2, Line 372: Interesting. Does this mean trxcon always sent measurement reports with L1 Header set to 0? -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:14:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:16:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:16:18 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-sip-connector Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11140 Change subject: 3G+2G.deps: add osmo-sip-connector ...................................................................... 3G+2G.deps: add osmo-sip-connector Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 --- M 3G+2G.deps 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/40/11140/1 diff --git a/3G+2G.deps b/3G+2G.deps index 5b4fa0a..5a17146 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -12,3 +12,4 @@ osmo-msc osmo-iuh osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn osmo-iuh osmo-ggsn +osmo-sip-connector libosmocore -- To view, visit https://gerrit.osmocom.org/11140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 Gerrit-Change-Number: 11140 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:16:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:16:18 +0000 Subject: Change in osmo-dev[master]: change default of MGW4BSC_PORT to 2427 Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11141 Change subject: change default of MGW4BSC_PORT to 2427 ...................................................................... change default of MGW4BSC_PORT to 2427 That way one can view the MGCP traffic in wireshark without changing the MGCP port. We are using a different IP for the two MGWs already, so they won't conflict even if they use the same port. Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 --- M net/config_2g3g 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/41/11141/1 diff --git a/net/config_2g3g b/net/config_2g3g index c7a19de..266997f 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -49,7 +49,7 @@ BSC_IP="${PUBLIC_IP}" BSC_PC="0.42.0" MGW4BSC_IP="${PUBLIC_IP2}" -MGW4BSC_PORT="12427" +MGW4BSC_PORT="2427" MGW4BSC_VTY_IP="127.0.0.2" HNBGW_PC="0.3.0" -- To view, visit https://gerrit.osmocom.org/11141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 Gerrit-Change-Number: 11141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:16:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:16:18 +0000 Subject: Change in osmo-dev[master]: run tcpdump *after* finding programs (not before) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11142 Change subject: run tcpdump *after* finding programs (not before) ...................................................................... run tcpdump *after* finding programs (not before) That way we can exit when the xterm or SIP server programs are not found without having tcpdump running in the background. Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f --- M net/tmpl_std/run.sh 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/42/11142/1 diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index 57dcc23..590b3c8 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -46,9 +46,6 @@ exec $terminal -title "CN:$title" -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'; $1; echo; while true; do echo 'q Enter to close'; read q_to_close; if [ \"x\$q_to_close\" = xq ]; then break; fi; done" } -sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & -sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & - hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" gbproxy="osmo-gbproxy" @@ -62,6 +59,9 @@ stp="osmo-stp" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" +sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & +sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & + term "$ggsn" GGSN & sleep .2 term "$stp" STP & -- To view, visit https://gerrit.osmocom.org/11142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f Gerrit-Change-Number: 11142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:16:19 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:16:19 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11143 Change subject: exit if xterm was not found ...................................................................... exit if xterm was not found Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/11143/1 diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index 590b3c8..4d45686 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -41,7 +41,8 @@ fi terminal="$(which urxvt || which xterm)" if ! which $terminal; then - echo "CANNOT FIND XTERM PROGRAM" + echo "ERROR: Couldn't find urxvt or xterm!" + exit 1 fi exec $terminal -title "CN:$title" -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'; $1; echo; while true; do echo 'q Enter to close'; read q_to_close; if [ \"x\$q_to_close\" = xq ]; then break; fi; done" } -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:16:19 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:16:19 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11144 Change subject: Support osmo-sip-connector with kamailio ...................................................................... Support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/1 diff --git a/net/config_2g3g b/net/config_2g3g index 266997f..05e82ea 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -30,6 +30,7 @@ HLR_IP="127.0.0.1" MSC_PC="0.23.1" +MSC_MNCC_SOCKET="/tmp/bsc_mncc" AUTH=optional ENCR_A5=0 @@ -71,3 +72,9 @@ SCRAMBLE2=258 LAC2=2${UARFCN2} RAC2=22 + +SIPCON_ENABLE="false" +SIPCON_LOCAL="${PUBLIC_IP}" +SIPCON_LOCAL_PORT="5069" +SIPCON_REMOTE="${PUBLIC_IP}" +SIPCON_REMOTE_PORT="5060" diff --git a/net/tmpl_std/kamailio.cfg b/net/tmpl_std/kamailio.cfg new file mode 100644 index 0000000..070ca55 --- /dev/null +++ b/net/tmpl_std/kamailio.cfg @@ -0,0 +1,418 @@ +#!KAMAILIO + +#!define WITH_DEBUG +#!define WITH_PSTN + +####### Defined Values ######### + +# - flags +# FLT_ - per transaction (message) flags +# FLB_ - per branch flags +#!define FLT_ACC 1 +#!define FLT_ACCMISSED 2 +#!define FLT_ACCFAILED 3 +#!define FLT_NATS 5 +#!define FLB_NATB 6 +#!define FLB_NATSIPPING 7 + +####### Global Parameters ######### + +### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR +#!ifdef WITH_DEBUG +debug=2 +log_stderror=yes +#!else +debug=2 +log_stderror=no +#!endif + +memdbg=5 +memlog=5 + +log_facility=LOG_LOCAL0 + +fork=yes +children=4 + +/* uncomment the next line to disable TCP (default on) */ +disable_tcp=yes + +/* uncomment the next line to disable the auto discovery of local aliases + based on reverse DNS on IPs (default on) */ +auto_aliases=no + +/* add local domain aliases */ +#alias="sip.mydomain.com" + +/* uncomment and configure the following line if you want Kamailio to + bind on a specific interface/port/proto (default bind on all available) */ +listen=${SIPCON_REMOTE}:${SIPCON_REMOTE_PORT} + +/* port to listen to + * - can be specified more than once if needed to listen on many ports */ +port=${SIPCON_REMOTE_PORT} + +# life time of TCP connection when there is no traffic +# - a bit higher than registration expires to cope with UA behind NAT +tcp_connection_lifetime=3605 + +####### Custom Parameters ######### + +# These parameters can be modified runtime via RPC interface +# - see the documentation of 'cfg_rpc' module. +# +# Format: group.id = value 'desc' description +# Access: $sel(cfg_get.group.id) or @cfg_get.group.id +# + +#!ifdef WITH_PSTN +# PSTN GW Routing +# +# - pstn.gw_ip: valid IP or hostname as string value, example: +# pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" +# +# - by default is empty to avoid misrouting +pstn.gw_ip = "${SIPCON_LOCAL}:${SIPCON_LOCAL_PORT}" desc "osmo-sip-connector Address" +#!endif + + +####### Modules Section ######## + +# set paths to location of modules (to sources or installation folders) +#!ifdef WITH_SRCPATH +mpath="modules" +#!else +mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" +#!endif + +# loadmodule "mi_fifo.so" +loadmodule "kex.so" +loadmodule "corex.so" +loadmodule "tm.so" +loadmodule "tmx.so" +loadmodule "sl.so" +loadmodule "rr.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "usrloc.so" +loadmodule "registrar.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +# loadmodule "ctl.so" +loadmodule "cfg_rpc.so" +loadmodule "mi_rpc.so" +loadmodule "acc.so" + +#!ifdef WITH_NAT +loadmodule "nathelper.so" +loadmodule "rtpproxy.so" +#!endif + +#!ifdef WITH_DEBUG +loadmodule "debugger.so" +#!endif + +# ----------------- setting module-specific parameters --------------- + +# ----- mi_fifo params ----- +#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") + +# ----- ctl params ----- +#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") + +# ----- tm params ----- +# auto-discard branches from previous serial forking leg +modparam("tm", "failure_reply_mode", 3) +# default retransmission timeout: 30sec +modparam("tm", "fr_timer", 30000) +# default invite retransmission timeout after 1xx: 120sec +modparam("tm", "fr_inv_timer", 120000) + +# ----- rr params ----- +# add value to ;lr param to cope with most of the UAs +modparam("rr", "enable_full_lr", 1) +# do not append from tag to the RR (no need for this script) +modparam("rr", "append_fromtag", 0) + +# ----- registrar params ----- +modparam("registrar", "method_filtering", 1) +/* uncomment the next line to disable parallel forking via location */ +# modparam("registrar", "append_branches", 0) +/* uncomment the next line not to allow more than 10 contacts per AOR */ +#modparam("registrar", "max_contacts", 10) +# max value for expires of registrations +modparam("registrar", "max_expires", 3600) +# set it to 1 to enable GRUU +modparam("registrar", "gruu_enabled", 0) + +# ----- acc params ----- +/* what special events should be accounted ? */ +modparam("acc", "early_media", 0) +modparam("acc", "report_ack", 0) +modparam("acc", "report_cancels", 0) +/* by default ww do not adjust the direct of the sequential requests. + if you enable this parameter, be sure the enable "append_fromtag" + in "rr" module */ +modparam("acc", "detect_direction", 0) +/* account triggers (flags) */ +modparam("acc", "log_flag", FLT_ACC) +modparam("acc", "log_missed_flag", FLT_ACCMISSED) +modparam("acc", "log_extra", + "src_user=$fU;src_domain=$fd;src_ip=$si;" + "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") +modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) + + +#!ifdef WITH_NAT +# ----- rtpproxy params ----- +modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") + +# ----- nathelper params ----- +modparam("nathelper", "natping_interval", 30) +modparam("nathelper", "ping_nated_only", 1) +modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) +modparam("nathelper", "sipping_from", "sip:pinger at kamailio.org") + +# params needed for NAT traversal in other modules +modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") +modparam("usrloc", "nat_bflag", FLB_NATB) +#!endif + + +#!ifdef WITH_DEBUG +# ----- debugger params ----- +modparam("debugger", "cfgtrace", 0) +#!endif + +####### Routing Logic ######## + + +# Main SIP request routing logic +# - processing of any incoming SIP request starts with this route +# - note: this is the same as route { ... } +request_route { + + xlog("GOT SIP $rm from $fu: $ru\n"); + # per request initial checks + route(REQINIT); + + # CANCEL processing + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } + exit; + } + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) + + # handle retransmissions + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + + if ("600" == $rU) { + route(ECHO); + } + + if ("500" == $rU) { + route(TEST); + } + + route(PSTN); +} + + +route[RELAY] { + # enable additional event routes for forwarded requests + # - serial forking, RTP relaying handling, a.s.o. + if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { + if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); + } + if (is_method("INVITE|SUBSCRIBE|UPDATE")) { + if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); + } + if (is_method("INVITE")) { + if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); + } + + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +# Per SIP request initial checks +route[REQINIT] { +#!ifdef WITH_ANTIFLOOD + # flood dection from same IP and traffic ban for a while + # be sure you exclude checking trusted peers, such as pstn gateways + # - local host excluded (e.g., loop to self) + if(src_ip!=myself) { + if($sht(ipban=>$si)!=$null) { + # ip is already blocked + xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); + exit; + } + if (!pike_check_req()) { + xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); + $sht(ipban=>$si) = 1; + exit; + } + } +#!endif + + if (!mf_process_maxfwd_header("2")) { + sl_send_reply("483","Too Many Hops"); + exit; + } + + if(is_method("OPTIONS") && uri==myself && $rU==$null) { + sl_send_reply("200","Keepalive"); + exit; + } + + if(!sanity_check("1511", "7")) { + xlog("Malformed SIP message from $si:$sp\n"); + exit; + } +} + +# Handle requests within SIP dialogs +route[WITHINDLG] { + if (!has_totag()) return; + + # sequential request withing a dialog should + # take the path determined by record-routing + if (loose_route()) { + if (is_method("BYE")) { + setflag(FLT_ACC); # do accounting ... + setflag(FLT_ACCFAILED); # ... even if the transaction fails + } + else if ( is_method("ACK") ) { + # ACK is forwarded statelessy + route(NATMANAGE); + } + else if ( is_method("NOTIFY") ) { + # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + record_route(); + } + route(RELAY); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # no loose-route, but stateful ACK; + # must be an ACK after a 487 + # or e.g. 404 from upstream server + route(RELAY); + exit; + } else { + # ACK without matching transaction ... ignore and discard + exit; + } + } + sl_send_reply("404", "Not here"); + exit; +} + +# RTPProxy control +route[NATMANAGE] { +#!ifdef WITH_NAT + if (is_request()) { + if(has_totag()) { + if(check_route_param("nat=yes")) { + setbflag(FLB_NATB); + } + } + } + if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) + return; + + rtpproxy_manage("co"); + + if (is_request()) { + if (!has_totag()) { + if(t_is_branch_route()) { + add_rr_param(";nat=yes"); + } + } + } + if (is_reply()) { + if(isbflagset(FLB_NATB)) { + set_contact_alias(); + } + } +#!endif + return; +} + +# PSTN GW routing +route[PSTN] { +#!ifdef WITH_PSTN + # check if PSTN GW IP is defined + if (strempty($sel(cfg_get.pstn.gw_ip))) { + xlog("SCRIPT: PSTN rotuing enabled but pstn.gw_ip not defined\n"); + return; + } + + # route to PSTN dialed numbers starting with '+' or '00' + # (international format) + # - update the condition to match your dialing rules for PSTN routing + #if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) + # return; + + # only local users allowed to call + #if(from_uri!=myself) { + # sl_send_reply("403", "Not Allowed"); + # exit; + #} + + $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); + + route(RELAY); + exit; +#!endif + + return; +} + +route[ECHO] { + $ru = "sip:echo at iptel.org"; + route(RELAY); + exit; +} + +route[TEST] { + $ru = "sip:music at iptel.org"; + route(RELAY); + exit; +} + +# Manage outgoing branches +branch_route[MANAGE_BRANCH] { + xdbg("new branch [$T_branch_idx] to $ru\n"); + route(NATMANAGE); +} + +# Manage incoming replies +onreply_route[MANAGE_REPLY] { + xdbg("incoming reply\n"); + if(status=~"[12][0-9][0-9]") + route(NATMANAGE); +} + +# Manage failure routing cases +failure_route[MANAGE_FAILURE] { + route(NATMANAGE); + + if (t_is_canceled()) { + exit; + } +} diff --git a/net/tmpl_std/osmo-sip-connector.cfg b/net/tmpl_std/osmo-sip-connector.cfg new file mode 100644 index 0000000..953eccd --- /dev/null +++ b/net/tmpl_std/osmo-sip-connector.cfg @@ -0,0 +1,6 @@ +app +mncc + socket-path ${MSC_MNCC_SOCKET} +sip + local ${SIPCON_LOCAL} ${SIPCON_LOCAL_PORT} + remote ${SIPCON_REMOTE} ${SIPCON_REMOTE_PORT} diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index 4d45686..1d4d8d3 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -60,6 +60,24 @@ stp="osmo-stp" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" +if [ "${SIPCON_ENABLE}" == "true" ]; then + sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" + msc="$msc -M ${MSC_MNCC_SOCKET}" + + # Require kamailio (sudo because Debian won't find it otherwise) + kamailio="$(sudo which kamailio)" + if [ -z "$kamailio" ]; then + echo "ERROR: kamailio is not installed, but it's required for SIPCON_ENABLE." + echo "After installing it, make sure that it does *not* run as daemon." + exit 1 + fi + kamailio="$kamailio -f kamailio.cfg -D -e -E" + + # Create /var/run/kamailio + sudo mkdir -p /var/run/kamailio + sudo chown -R $(id -u) /var/run/kamailio +fi + sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & @@ -83,6 +101,13 @@ sleep .2 term "$bsc" BSC & +if [ "${SIPCON_ENABLE}" == "true" ]; then + sleep .2 + term "$sipcon" SIPCON & + sleep .2 + term "$kamailio" KAMAILIO & +fi + #ssh bts rm /tmp/bts.log /tmp/pcu.log #ssh bts neels/run_remote.sh & @@ -90,6 +115,12 @@ read enter_to_close echo Closing... +if [ "${SIPCON_ENABLE}" == "true" ]; then + kill %13 %14 + killall osmo-sip-connector + killall kamailio +fi + #ssh bts neels/stop_remote.sh kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:17:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:17:35 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11140 ) Change subject: 3G+2G.deps: add osmo-sip-connector ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 Gerrit-Change-Number: 11140 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10: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 Fri Sep 28 10:18:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:18:24 +0000 Subject: Change in osmo-dev[master]: change default of MGW4BSC_PORT to 2427 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11141 ) Change subject: change default of MGW4BSC_PORT to 2427 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 Gerrit-Change-Number: 11141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:18: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 Sep 28 10:20:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:20:15 +0000 Subject: Change in osmo-dev[master]: run tcpdump *after* finding programs (not before) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11142 ) Change subject: run tcpdump *after* finding programs (not before) ...................................................................... Patch Set 1: I don't really see the difference in this commit. Can you explain better? -- To view, visit https://gerrit.osmocom.org/11142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f Gerrit-Change-Number: 11142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:20:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:21:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:21:04 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: exit if xterm was not found ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:21:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:22:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 10:22:30 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 143 PS2, Line 143: "Dummy" Measurement Report > should the L1 SACCH header even of the dummy not contain the actual MS power level that is used / th [?] Hmm, I think it should. Good point, thanks! Let's use the actual TA and PWR values at least for the "dummy" ones. It could be also great to have actual values in the cached reports, but trxcon doesn't know about the intentions of the higher layers, i.e. whether the distance spoofing enabled or not. If the higher layers would indicate spoofing, e.g. as a part of the L1CTL_PARAM_REQ message, we could decide here... -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 10:22: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 Sep 28 10:26:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:26:39 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: Support osmo-sip-connector with kamailio ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11144/1/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11144/1/net/tmpl_std/run.sh at 63 PS1, Line 63: if [ "${SIPCON_ENABLE}" == "true" ]; then I know the script uses /bin/bash, but you can easily keep it sh compatible by using "=" instead of "==" right? https://gerrit.osmocom.org/#/c/11144/1/net/tmpl_std/run.sh at 68 PS1, Line 68: kamailio="$(sudo which kamailio)" is it in /sbin? -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:26:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:27:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:27:47 +0000 Subject: Change in osmo-dev[master]: run tcpdump *after* finding programs (not before) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11142 ) Change subject: run tcpdump *after* finding programs (not before) ...................................................................... Patch Set 1: Code-Review-1 tcpdump runs in the background. With this change it runs after setting the program variables. Now that you've asked me to look at it again, I realize that I made a mistake here, I thought the script would also check for the xterm program while filling the program variables (see the term() function above). But that is not the case, the term() function gets executed afterwards. So this commit will only make sense when the part that checks if xterm or urxvt is installed gets executed before starting the tcpdump instances. (I've added this after the last patch originally, which adds support for osmo-sip-connector, and there I check if the sip server is installed while filling out the program variables.) Thanks for looking through the patches! -- To view, visit https://gerrit.osmocom.org/11142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f Gerrit-Change-Number: 11142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:27: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 Sep 28 10:30:01 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:30:01 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11144 ) Change subject: Support osmo-sip-connector with kamailio ...................................................................... Support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/2 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:30:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:30:57 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: Support osmo-sip-connector with kamailio ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:30: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 Sep 28 10:31:32 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:31:32 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: Support osmo-sip-connector with kamailio ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11144/1/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11144/1/net/tmpl_std/run.sh at 63 PS1, Line 63: if [ "${SIPCON_ENABLE}" == "true" ]; then > I know the script uses /bin/bash, but you can easily keep it sh compatible by using "=" instead of " [?] Good point, changed to "=". https://gerrit.osmocom.org/#/c/11144/1/net/tmpl_std/run.sh at 68 PS1, Line 68: kamailio="$(sudo which kamailio)" > is it in /sbin? yes. I could also set PATH=... beforehand if that is more elegant. -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 28 Sep 2018 10:31: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 Sep 28 10:45:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:45:28 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11143 to look at the new patch set (#2). Change subject: exit if xterm was not found ...................................................................... exit if xterm was not found Move the check for an xterm compatible terminal to right before we start tcpdump. And if we can't find it, exit before tcpdump gets executed. Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/11143/2 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:45:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:45:28 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11144 to look at the new patch set (#3). Change subject: Support osmo-sip-connector with kamailio ...................................................................... Support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/3 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:46:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 10:46:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: (5 comments) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at a372 PS2, Line 372: > Interesting. [?] It was a dirty hack to make both TTCN-3 and OsmoBTS happy ;) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 180 PS2, Line 180: prim->payload[0] = trx->tx_power; > I think this should be done (without if 0) in line 172, in the dummy meas rep case. Please see the above comment. I am going to change it to use the actual values, but for the "dummy" MRs only. https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 192 PS2, Line 192: LOGP(DSCHD, LOGL_NOTICE, "Transmitting a %s Measurement Report " > We are not transmitting here. [?] Thanks! "Using" looks good to me. https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 234 PS2, Line 234: mr_now = !lchan->sacch.mr_tx_last; > With this toggle and above coment from "sub-clause 3.4. [?] I don't know what do you mean by "SACCH slots". If you mean the sub-slots (e.g. TRXC_SACCH4_0 that accomplishes TRXC_SDCCH4_0), this function itself handles each one individually. The idea of this flag is to determine, *what can be transmitted* at the moment depending on what was transmitted last time: - if a Measurement Report was transmitted last time, we can then either transmit something else (i.e. not a MR), or again a Measurement Report if there are no other SACCH messages. - if a Measurement Report was not transmitted last time, we can transmit a Measurement Report only. This simple logic implements the requirement from sub-clause 3.4.1. https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 259 PS2, Line 259: if (mr_now && prim_mr) > This if-else clause can be merged into previous 2 ifs, and it's way clear imho. [?] Let's leave it as is for now. For me, the nested conditions here would look a bit more complicated than it's now. -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 10:46:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 28 Sep 2018 10:47:25 +0000 Subject: Change in osmo-dev[master]: run tcpdump *after* finding programs (not before) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11142 ) Change subject: run tcpdump *after* finding programs (not before) ...................................................................... Patch Set 1: Verified+1 -Code-Review This makes sense now with the next commit, it moves the xterm check right before the tcpdump. https://gerrit.osmocom.org/#/c/osmo-dev/+/11143/ -- To view, visit https://gerrit.osmocom.org/11142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f Gerrit-Change-Number: 11142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 10:47: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 Sep 28 10:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:50:39 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 259 PS2, Line 259: if (mr_now && prim_mr) > Let's leave it as is for now. For me, the nested conditions [?] Getting rid of prim_mr and prim_nmr can make this function half size of what it is now, but fine for me. There's no need for those two variables since you always seek only 1 prim object and its value is known just by looking at "mr_now" and checking it's not NULL. -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 10:50:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 10:50:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 10:50:43 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 10:50: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 Sep 28 10:57:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 10:57:05 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH 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/11138 to look at the new patch set (#3). Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... trxcon/scheduler: fix Measurement Reporting on SACCH According to 3GPP TS 04.08, section 3.4.1, SACCH logical channel accompanies either a traffic or a signaling channel. It has the particularity that continuous transmission must occur in both directions, so on the Uplink direction measurement result messages are sent at each possible occasion when nothing else has to be sent. The LAPDm fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not applicable on SACCH channels! Unfortunately, 3GPP TS 04.08 doesn't clearly state which "else messages" besides Measurement Reports can be send by the MS on SACCH channels. However, in sub-clause 3.4.1 it's stated that the interval between two successive measurement result messages shall not exceed one L2 frame. This change introduces a separate handler for SACCH primitives, which dequeues a SACCH primitive from transmit queue, if present. Otherwise it dequeues a cached Measurement Report (the last received one). Finally, if the cache is empty, a "dummy" measurement report is used. When it's possible, a non-MR primitive is prioritized. Change-Id: If1b8dc74ced746d6270676fdde75fcda32f91a3d Related: OS#2988 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 204 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/11138/3 -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) 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 Sep 28 10:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 10:58:21 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 143 PS2, Line 143: "Dummy" Measurement Report > should the L1 SACCH header even of the dummy not contain the actual MS power level that is used / th [?] Done https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_prim.c at 192 PS2, Line 192: LOGP(DSCHD, LOGL_NOTICE, "Transmitting a %s Measurement Report " > We are not transmitting here. [?] Done https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_trx.h File src/host/trxcon/sched_trx.h: https://gerrit.osmocom.org/#/c/11138/2/src/host/trxcon/sched_trx.h at 196 PS2, Line 196: uint8_t mr_tx_last; /*!< 0x01 - yes, 0x00 - no */ > why not using a bool here? Done -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 10:58:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 11:06:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 11:06:58 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH 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/11138 to look at the new patch set (#4). Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... trxcon/scheduler: fix Measurement Reporting on SACCH According to 3GPP TS 04.08, section 3.4.1, SACCH logical channel accompanies either a traffic or a signaling channel. It has the particularity that continuous transmission must occur in both directions, so on the Uplink direction measurement result messages are sent at each possible occasion when nothing else has to be sent. The LAPDm fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not applicable on SACCH channels! Unfortunately, 3GPP TS 04.08 doesn't clearly state which "else messages" besides Measurement Reports can be send by the MS on SACCH channels. However, in sub-clause 3.4.1 it's stated that the interval between two successive measurement result messages shall not exceed one L2 frame. This change introduces a separate handler for SACCH primitives, which dequeues a SACCH primitive from transmit queue, if present. Otherwise it dequeues a cached Measurement Report (the last received one). Finally, if the cache is empty, a "dummy" measurement report is used. When it's possible, a non-MR primitive is prioritized. Change-Id: If1b8dc74ced746d6270676fdde75fcda32f91a3d Related: OS#2988 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 211 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/11138/4 -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) 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 Sep 28 11:12:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 11:12:51 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 4: (1 comment) > I expect a similar patch for l23_api/l1 firmware Sure, I am going to work on it too :) > as there's some similar code there, right? It is similar, but the global state is used there, so having multiple independent connections with Calypso PHY is not possible. Anyway, this is not that important. https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c at 182 PS4, Line 182: * FIXME: this would require having access to the trx_instance, Let's do it later in a separate change. -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 11:12:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 11:25:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 11:25:46 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: drop redundant tn validation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11145 Change subject: trxcon/sched_prim.c: drop redundant tn validation ...................................................................... trxcon/sched_prim.c: drop redundant tn validation Change-Id: I553b4cc39b2efd7b60346160c57f01ee4cf066be --- M src/host/trxcon/sched_prim.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/11145/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e03f93f..2067900 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -102,10 +102,6 @@ /* Determine TS index */ tn = chan_nr & 0x7; - if (tn > 7) { - LOGP(DSCH, LOGL_ERROR, "Incorrect TS index %u\n", tn); - return -EINVAL; - } /* Check whether required timeslot is allocated and configured */ ts = trx->ts_list[tn]; -- To view, visit https://gerrit.osmocom.org/11145 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: I553b4cc39b2efd7b60346160c57f01ee4cf066be Gerrit-Change-Number: 11145 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 11:55:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 11:55:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW 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/11083 to look at the new patch set (#4). Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... bts: Add module parameters with tolerance to support real HW When we don't use trxcon (ie we run real HW) we cannot set some parameters like ms power level, so we need to relax template matching when we receive UL measurements in that case. This commit makes tests TC_meas_res_sign_tchf and TC_meas_res_sign_tchh_toa256 pass with motorola CXX and osmo-trx+osmo-bts-trx. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn M library/L1CTL_Types.ttcn 2 files changed, 66 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11083/4 -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 4 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 Fri Sep 28 12:10:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 12:10:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 4: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11083/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11083/4//COMMIT_MSG at 7 PS4, Line 7: bts: Add module parameters with tolerance to support real HW If the commit message states that we "add module parameters", it should add module parameters, but not L1CTL/L3 templates. A separate change makes sense I think ;) https://gerrit.osmocom.org/#/c/11083/4/library/L1CTL_Types.ttcn File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/#/c/11083/4/library/L1CTL_Types.ttcn at 281 PS4, Line 281: L1ctlDataReq The L1CTL_DATA_REQ is not only used to carry SACCH messages. Other message types (non-SACCH) have no L1 SACCH header. It should actually contain the 'l1ctl_info_ul' header, see OsmocomBB/l1ctl_proto.h for details. Anyway, the L1CTL implementation should be abstracted from this. What about L3_Templates.ttcn? -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 12:10: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 Sep 28 12:32:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 28 Sep 2018 12:32:28 +0000 Subject: Change in osmo-msc[master]: fix a use-after-free in msc_mgcp.c:_handle_error() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11146 Change subject: fix a use-after-free in msc_mgcp.c:_handle_error() ...................................................................... fix a use-after-free in msc_mgcp.c:_handle_error() Move code which needs to test the mgcp_ctx->free_ctx flag upwards such that it runs before we're calling functions which will potentially free mgcp_ctx. The code being moved up takes effect only in case mgcp_ctx won't be freed, so there should be no functional difference. Change-Id: I5df17c19e2a68c019f7eaf582b14585caa54b32a Related: OS#2885 --- M src/libmsc/msc_mgcp.c 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/11146/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index e58b249..acdb785 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -183,6 +183,16 @@ LOGPFSMLSRC(mgcp_ctx->fsm, LOGL_ERROR, file, line, "%s -- graceful shutdown...\n", get_value_string(msc_mgcp_cause_codes_names, cause)); + /* Request the higher layers (gsm_04_08.c) to release the call. If the + * problem occured after msc_mgcp_call_release() was calls, remain + * silent because we already got informed and the higher layers might + * already freed their context information (trans). */ + if (!mgcp_ctx->free_ctx) { + mncc_set_cause(&mncc, GSM48_CAUSE_LOC_TRANS_NET, + GSM48_CC_CAUSE_RESOURCE_UNAVAIL); + mncc_tx_to_cc(mgcp_ctx->trans->net, MNCC_REL_REQ, &mncc); + } + /* For the shutdown we have two options. Whenever it makes sense to * send a DLCX to the MGW in order to be sure that the connection is * properly cleaned up, the dlcx flag should be set. In other cases @@ -205,16 +215,6 @@ osmo_fsm_inst_state_chg(fi, ST_HALT, 0, 0); osmo_fsm_inst_dispatch(fi, EV_TEARDOWN_ERROR, mgcp_ctx); } - - /* Request the higher layers (gsm_04_08.c) to release the call. If the - * problem occured after msc_mgcp_call_release() was calls, remain - * silent because we already got informed and the higher layers might - * already freed their context information (trans). */ - if (!mgcp_ctx->free_ctx) { - mncc_set_cause(&mncc, GSM48_CAUSE_LOC_TRANS_NET, - GSM48_CC_CAUSE_RESOURCE_UNAVAIL); - mncc_tx_to_cc(mgcp_ctx->trans->net, MNCC_REL_REQ, &mncc); - } } /* Timer callback to shut down in case of connectivity problems */ -- To view, visit https://gerrit.osmocom.org/11146 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: I5df17c19e2a68c019f7eaf582b14585caa54b32a Gerrit-Change-Number: 11146 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 12:43:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 12:43:06 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 4: > I expect a similar patch for l23_api/l1 firmware > as there's some similar code there, right? I just checked out the firmware source, and it turns out that it already does the caching. No changes required there. -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 12:43:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 13:14:15 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 28 Sep 2018 13:14:15 +0000 Subject: Change in osmo-msc[master]: fix a use-after-free in msc_mgcp.c:_handle_error() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11146 ) Change subject: fix a use-after-free in msc_mgcp.c:_handle_error() ...................................................................... Patch Set 1: Code-Review+1 > Build Successful > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-msc/686/ : > SUCCESS' --verified 1 --code-review 0 -- To view, visit https://gerrit.osmocom.org/11146 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: I5df17c19e2a68c019f7eaf582b14585caa54b32a Gerrit-Change-Number: 11146 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 28 Sep 2018 13:14:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 13:32:31 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 28 Sep 2018 13:32:31 +0000 Subject: Change in osmo-msc[master]: fix a use-after-free in msc_mgcp.c:_handle_error() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11146 ) Change subject: fix a use-after-free in msc_mgcp.c:_handle_error() ...................................................................... Patch Set 1: Verified+1 > > Build Successful > > > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-msc/686/ : > > SUCCESS' --verified 1 --code-review 0 -- To view, visit https://gerrit.osmocom.org/11146 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: I5df17c19e2a68c019f7eaf582b14585caa54b32a Gerrit-Change-Number: 11146 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 28 Sep 2018 13:32: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 Sep 28 13:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 13:46:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add module parameters with tolerance to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add module parameters with tolerance to support real HW ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/11083/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11083/4//COMMIT_MSG at 7 PS4, Line 7: bts: Add module parameters with tolerance to support real HW > If the commit message states that we "add module parameters", [?] Agree https://gerrit.osmocom.org/#/c/11083/4/library/L1CTL_Types.ttcn File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/#/c/11083/4/library/L1CTL_Types.ttcn at 281 PS4, Line 281: L1ctlDataReq > The L1CTL_DATA_REQ is not only used to carry SACCH messages. [?] That's why l1header is defined as optional. ts_L1CTL_DATA_REQ still uses "octetstring other", but could be changed to use L1ctlDataReq with l1header := omit. It already contains the info_ul part, see ts_L1CTL_DATA_REQ and ts_L1CTL_DATA_REQ_SACCH. I'll look into adding it to L3_Templates. I added it here since it looked like the less aggressive change, and I couldn't find a real good place for it (since it's actually a L1 header, not l2 apparently. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 13:46:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 14:05:53 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 28 Sep 2018 14:05:53 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11132 to look at the new patch set (#4). Change subject: osmo-config-merge: Fix some small issues ...................................................................... osmo-config-merge: Fix some small issues Allocate NULL context after exit_usage() calls and free it before exit so * sanitizer is happy. Also handle the error cases gracefully when a file is unreadable or formatted wrong. Change-Id: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 --- M utils/osmo-config-merge.c 1 file changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/11132/4 -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 14:05:53 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 28 Sep 2018 14:05:53 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page 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/11133 to look at the new patch set (#4). Change subject: osmo-config-merge: Add manual page ...................................................................... osmo-config-merge: Add manual page Change-Id: Ifaa5afe28779a805764caf76a89efb0a3169942e --- M .gitignore M Makefile.am M configure.ac A man/Makefile.am A man/osmo-config-merge.adoc 5 files changed, 94 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/11133/4 -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 4 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 Fri Sep 28 14:07:46 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 28 Sep 2018 14:07:46 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/11132/3/utils/osmo-config-merge.c File utils/osmo-config-merge.c: https://gerrit.osmocom.org/#/c/11132/3/utils/osmo-config-merge.c at 130 PS3, Line 130: read > I think "Could not open ..." would be a bit more informative. [?] Done https://gerrit.osmocom.org/#/c/11132/3/utils/osmo-config-merge.c at 236 PS3, Line 236: > Not sure we need this white space. Let's just remove this chunk [?] Done -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 14:07:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 14:15:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 14:15:19 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 28 Sep 2018 14:15: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 Sep 28 14:21:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 14:21:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11083 to look at the new patch set (#5). Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... bts: Add timing offset tolerance module parameter to support real HW When we don't use trxcon (ie we run real HW) we need to relax template matching when we receive UL measurements in that case. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn 1 file changed, 15 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11083/5 -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) 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 Sep 28 14:21:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 14:21:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types: Add support to set L1 Header params during SACCH tx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11147 Change subject: L1CTL_Types: Add support to set L1 Header params during SACCH tx ...................................................................... L1CTL_Types: Add support to set L1 Header params during SACCH tx Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 --- M library/L1CTL_Types.ttcn 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/11147/1 diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 656f292..0e1f036 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -263,6 +263,26 @@ OCT2 padding } with { variant "" }; + /* TS 44.004 7.2.1 */ + type record SACCH_L1_HEADER { + uint2_t reserved, + boolean fpc, + uint5_t ms_power_lvl, + uint8_t actual_ta + } with { variant "FIELDORDER(msb)" }; + + template (value) SACCH_L1_HEADER ts_SACCH_L1_HEADER(uint5_t ms_power_lvl, boolean fpc, uint8_t actual_ta) := { + reserved := 0, + fpc := fpc, + ms_power_lvl := ms_power_lvl, + actual_ta := actual_ta + }; + + type record L1ctlDataReq { + SACCH_L1_HEADER l1header optional, + octetstring l2_payload + } with { variant "" }; + type record L1ctlH1 { uint8_t hsn, uint8_t maio, @@ -320,6 +340,7 @@ L1CtlCryptoReq crypto_req, L1ctlTrafficReq traffic_req, L1ctlTbfCfgReq tbf_cfg_req, + L1ctlDataReq data_req, octetstring other } with { variant (other) "BYTEORDER(first)" @@ -351,6 +372,7 @@ crypto_req, header.msg_type = L1CTL_CRYPTO_REQ; traffic_req, header.msg_type = L1CTL_TRAFFIC_REQ; tbf_cfg_req, header.msg_type = L1CTL_TBF_CFG_REQ; + data_req, header.msg_type = L1CTL_DATA_REQ; other, OTHERWISE; )" }; @@ -542,6 +564,22 @@ } } + template (value) L1ctlUlMessage ts_L1CTL_DATA_REQ_SACCH(template (value) RslChannelNr chan_nr, + template (value) RslLinkId link_id, + L1ctlDataReq data_req) := { + header := ts_L1ctlHeader(L1CTL_DATA_REQ), + ul_info := { + chan_nr := chan_nr, + link_id := link_id, + padding := '0000'O + }, + ul_info_tbf := omit, + ul_info_abs := omit, + payload := { + data_req := data_req + } + } + template (value) L1ctlUlMessage ts_L1CTL_TBF_CFG_REQ(boolean is_uplink, TfiUsfArr tfi_usf) := { header := ts_L1ctlHeader(L1CTL_TBF_CFG_REQ), ul_info := omit, -- To view, visit https://gerrit.osmocom.org/11147 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: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 Gerrit-Change-Number: 11147 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 Sep 28 14:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 14:21:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11148 Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... bts: Add parameter to set and expect a specific MS power level This change uses recently added ts_L1CTL_DATA_REQ_SACCH to be able to set the L1 Header parameters to match the expected MS power level announced by the BTS. Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 --- M bts/BTS_Tests.ttcn 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/11148/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 4209e4e..e7df027 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -57,6 +57,7 @@ integer mp_tolerance_rxlev := 3; integer mp_tolerance_timing_offset_256syms := 0; integer mp_rxlev_exp := 57; + integer mp_ms_power_level_exp := 7; integer mp_ms_actual_ta_exp := 0; integer mp_timing_offset_256syms_exp := 512; } @@ -167,7 +168,7 @@ template (value) CellSelectionParameters ts_CellSelPar_default := { cell_resel_hyst_2dB := 2, - ms_txpwr_max_cch := 7, + ms_txpwr_max_cch := mp_ms_power_level_exp, acs := '0'B, neci := true, rxlev_access_min := 0 @@ -526,7 +527,7 @@ }, timing_offset_256syms := mp_timing_offset_256syms_exp, bs_power_level := 0, - ms_power_level := 0, + ms_power_level := mp_ms_power_level_exp, ms_actual_ta := mp_ms_actual_ta_exp }, spec := omit, @@ -1163,9 +1164,13 @@ var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, 23, 23, 0, 0, omit)); var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep))); log("LAPDm: ", lb); - var octetstring pl := '0000'O & enc_LapdmFrameAB(lb); - L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, ts_RslLinkID_SACCH(0), - f_pad_oct(pl, 23, '2B'O))); + + var L1ctlDataReq data_req := { + l1header := valueof(ts_SACCH_L1_HEADER(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), + l2_payload := f_pad_oct(enc_LapdmFrameAB(lb), 21, '2B'O) + } + log("Sending Measurement Report: ", data_req); + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), data_req)); repeat; } } -- To view, visit https://gerrit.osmocom.org/11148 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: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 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 Sep 28 14:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 14:21:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11149 Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep If for whatever reason (eg. CPU scheduling saturation) the L1CTL cli (TTCN3) doesn't send Measurement Reports on time, lower osmocombb layers will generate their own dummy Measurement Reports since SACCH must always be filled. Those dummy Measurement Reports are filled from parameters previosuly set using L1CTL_PARAM_REQ (implemented by f_L1CTL_PARAM() in TTCN3). Since that function is never called, we need to call it to set the expected MS power level values in order to send expected values in case we don't send the Measurement Report through L1CTL on time. Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/11149/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index e7df027..097da13 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1365,7 +1365,10 @@ var GsmFrameNumber fn; var ImmediateAssignment imm_ass; var integer ra := 23; + var integer ta := g_pars.l1_pars.ms_actual_ta; + var integer tx_power := g_pars.l1_pars.ms_power_level; + f_L1CTL_PARAM(L1CTL, ta, tx_power); fn := f_L1CTL_RACH(L1CTL, ra); /* This arrives on CCHAN, so we cannot test for receiving CHAN RQDhere */ //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1))); -- To view, visit https://gerrit.osmocom.org/11149 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: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 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 Sep 28 14:24:35 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 28 Sep 2018 14:24:35 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11133 ) Change subject: osmo-config-merge: Add manual page ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 14:24:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 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_#260?= In-Reply-To: <467969450.349.1538061006968.JavaMail.jenkins@jenkins.osmocom.org> References: <467969450.349.1538061006968.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1719487855.360.1538147407134.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 flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l 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 %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.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_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 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_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 -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_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_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_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 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_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_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 -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_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 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 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_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_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.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_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 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 Fri Sep 28 15:48:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 15:48:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11149 ) Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11149/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11149/1//COMMIT_MSG at 11 PS1, Line 11: dummy As I already mentioned in 11138, the firmware actually implements MR caching. Dummy ones are being sent before the first MR received from L23, then cached MR is used. As soon as we mere 11138, trxcon will also follow this approach. https://gerrit.osmocom.org/#/c/11149/1//COMMIT_MSG at 13 PS1, Line 13: Those Only dummy MRs are filled with the actual parameters, cached ones remain the same until the next one appears. https://gerrit.osmocom.org/#/c/11149/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11149/1/bts/BTS_Tests.ttcn at 1371 PS1, Line 1371: f_L1CTL_PARAM(L1CTL, ta, tx_power); Why do we need both variables? Why not to pass the values directly? f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level); should work just fine... -- To view, visit https://gerrit.osmocom.org/11149 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: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 15:48: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 Sep 28 15:53:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 15:53:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn at 1264 PS5, Line 1264: 33024 Where does this magic number comes from? -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 15:53:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 16:18:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 16:18:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5861?= Message-ID: <1533462509.361.1538151496018.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 202.92 KB...] 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/gprs/Makefile.am: installing './depcomp' tests/gprs/Makefile.am:8: warning: source file '$(top_srcdir)/src/gprs/gprs_utils.c' is in a subdirectory, tests/gprs/Makefile.am:8: 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. + ./configure --enable-sanitize --enable-werror --disable-iu --enable-external-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 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 LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMOGB... yes checking for LIBOSMONETIF... yes checking for LIBGTP... yes checking for LIBCARES... yes checking for ANSI C header files... (cached) 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... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-sgsn.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/sgsn/Makefile config.status: creating src/Makefile config.status: creating src/gprs/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gprs/Makefile config.status: creating tests/gbproxy/Makefile config.status: creating tests/sgsn/Makefile config.status: creating tests/gtphub/Makefile config.status: creating tests/xid/Makefile config.status: creating tests/sndcp_xid/Makefile config.status: creating tests/slhc/Makefile config.status: creating tests/v42bis/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/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.3.0.54-395c > .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 sgsn make[4]: Entering directory '/build/include/osmocom/sgsn' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/sgsn' 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 gprs make[3]: Entering directory '/build/src/gprs' CC gb_proxy_main.o CC gb_proxy.o CC gb_proxy_ctrl.o CC gb_proxy_vty.o CC gprs_gb_parse.o CC gb_proxy_peer.o CC gb_proxy_patch.o CC gb_proxy_tlli.o CC gprs_llc_parse.o CC crc24.o CC gprs_utils.o CC gprs_gmm_attach.o CC gprs_gmm.o CC gprs_sgsn.o CC gprs_sndcp.o gprs_gmm.c: In function 'gsm0408_gprs_rcvmsg_iu': gprs_gmm.c:2880:9: note: #pragma message: set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS? #pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" ^ CC gprs_sndcp_comp.o CC gprs_sndcp_dcomp.o CC gprs_sndcp_pcomp.o CC gprs_sndcp_vty.o CC gprs_sndcp_xid.o CC sgsn_main.o CC sgsn_vty.o CC sgsn_libgtp.o CC gprs_llc.o CC gprs_llc_vty.o CC sgsn_ctrl.o CC sgsn_auth.o CC gprs_subscriber.o CC sgsn_cdr.o CC sgsn_ares.o CC slhc.o CC gprs_llc_xid.o CC v42bis.o CC gsup_client.o CC gtphub_main.o CC gtphub.o CC gtphub_sock.o CC gtphub_ares.o CC gtphub_vty.o CCLD osmo-gbproxy /bin/bash: line 1: 23979 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=link gcc -Wall -fno-strict-aliasing -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmo-abis/include/ -I/build/deps/install/stow/libosmocore/include/ -fno-strict-aliasing -I/build/deps/install/stow/osmo-ggsn/include/ -g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess -o osmo-gbproxy gb_proxy.o gb_proxy_main.o gb_proxy_vty.o gb_proxy_ctrl.o gb_proxy_patch.o gb_proxy_tlli.o gb_proxy_peer.o gprs_gb_parse.o gprs_llc_parse.o crc24.o gprs_utils.o -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmogsm -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmovty -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmoctrl -losmogsm -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmogb -losmovty -losmocore -L/build/deps/install/stow/osmo-ggsn/lib -lgtp -lrt Makefile:539: recipe for target 'osmo-gbproxy' failed make[3]: *** [osmo-gbproxy] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/gprs' Makefile:376: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:494: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:402: 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 Sep 28 16:34:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Sep 2018 16:34:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11148 ) Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11148/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11148/1/bts/BTS_Tests.ttcn at 1169 PS1, Line 1169: l1header := valueof(ts_SACCH_L1_HEADER(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), Also, I think it makes sense to use the parameters from L1 SACCH pseudo-header indicated on DL, i.e. from 'l1_dl'. In the normal OsmocomBB setup, the SI 5/5ter/6 messages are being forwarded from L1 to the higher layers, which then instruct L1 via L1CTL_PARAM_REQ. -- To view, visit https://gerrit.osmocom.org/11148 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: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 16:34:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 17:26:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 17:26:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn at 1264 PS5, Line 1264: 33024 > Where does this magic number comes from? TBH, I don't recall how I ended it up here, but I now think it should be 63*256=16128, right? -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 17: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 Fri Sep 28 17:30:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 17:30:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn at 1288 PS5, Line 1288: var template uint8_t t_toffs := f_tolerance(offs, -63, 192, mp_tolerance_timing_offset_256syms/256); I think I swapped these values with those of line 1285, I need to have a look at these ranges again. -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 17:30: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 Sep 28 17:31:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 17:31:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11148 ) Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11148/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11148/1/bts/BTS_Tests.ttcn at 1169 PS1, Line 1169: l1header := valueof(ts_SACCH_L1_HEADER(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), > Also, I think it makes sense to use the parameters from L1 [?] This is another improvement of the test, and I agree it makes sense but it can be done in a later patch later in time. -- To view, visit https://gerrit.osmocom.org/11148 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: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 17:31:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 17:45:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 17:45:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11149 ) Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11149/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11149/1//COMMIT_MSG at 11 PS1, Line 11: dummy > As I already mentioned in 11138, the firmware actually [?] in firmware case, the cached message is also removed during L1CTL_DM_REL_REQ, because it is called this way: l1a_meas_msgb_set(NULL); In turn L1CTL_RESET_REQ will reset variables used in tx_power. So I think we need to keep this commit, but I can add something like: "If for whatever reason (eg. CPU scheduling saturation) the L1CTL cli (TTCN3) doesn't send Measurement Reports on time and no previous one is cached or has been erased by L1CTL_DM_REL_REQ," https://gerrit.osmocom.org/#/c/11149/1//COMMIT_MSG at 13 PS1, Line 13: Those > Only dummy MRs are filled with the actual parameters, [?] Agree. That's more a less what I'm saying here. I need to add to the tail: "in order to send expected values in case the cache is empty and we don't send the Measurement Report through L1CTL on time." https://gerrit.osmocom.org/#/c/11149/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11149/1/bts/BTS_Tests.ttcn at 1371 PS1, Line 1371: f_L1CTL_PARAM(L1CTL, ta, tx_power); > Why do we need both variables? [?] I'll pass the variables directly. -- To view, visit https://gerrit.osmocom.org/11149 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: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 17:45: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 Sep 28 18:16:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 28 Sep 2018 18:16:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn at 1285 PS5, Line 1285: actual_ta := f_tolerance(l1p.ms_actual_ta, 0, 63, mp_tolerance_timing_offset_256syms/256) According to "3GPP TS 48.058", "9.3.10 L1 Information": """ Octets 2-3 contain the L1 header information of SACCH blocks. The information fields and codings are as defined in 3GPP TS 44.004. """ Then. According to "3GPP TS 44.004", "6.1 Physical layer protocol fields and procedures:" """ For all the bands except GSM 400, the values 0 to 63 are valid TA values. The bit pattern "1111111" indicates that the field does not contain a timing advance value. All other bit combinations (64 to 126 decimal) are reserved. For all bands except GSM 400 bit 8 is set to spare. """ So this one is good. https://gerrit.osmocom.org/#/c/11083/5/bts/BTS_Tests.ttcn at 1288 PS5, Line 1288: var template uint8_t t_toffs := f_tolerance(offs, -63, 192, mp_tolerance_timing_offset_256syms/256); > I think I swapped these values with those of line 1285, I need to have a look at these ranges again. According to "3GPP TS 48.058", "9.3.37 MS Timing Offset": """ The meaning of the MS Timing Offset is as defined in 3GPP TS 45.010. The value of MS Timing Offset is the binary value of the 8-bit Timing Offset field (octet 2) - 63. The range of MS Timing Offset is therefore -63 to 192. """ And looking for "Timing Offset" in TS 45.010 I could only find this: """ MS timing offset: delay of the received signal relative to the expect ed signal from an MS at zero distance under static channel conditions with zero timing advance. This is accurate to ? 1 symbol, and reported once per SACCH or after a RACH as. required (i.e. at the same rate as timing advan ce). For example, for an MS with a round trip propagation delay of P symbols, but with a timing advance of T symbols, the reported timing offset will be P-T quantized to the nearest symbol. For GPRS the MS timing offset is not reported. """ So, as a result: line 1264 should have ranges (-63*256, 192*256). line 1285 should have ranges (0,63) (correct in current version). line 1288 should have ranges (0, 255). -- To view, visit https://gerrit.osmocom.org/11083 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: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 18:16:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 20:44:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 20:44:35 +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_#5862?= In-Reply-To: <1533462509.361.1538151496018.JavaMail.jenkins@jenkins.osmocom.org> References: <1533462509.361.1538151496018.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1684287781.362.1538167475839.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Sep 28 22:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 22:58:52 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11133 ) Change subject: osmo-config-merge: Add manual page ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 22:58: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 Sep 28 22:59:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 22:59:13 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 28 Sep 2018 22: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 Sep 28 22:59:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 22:59:22 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Fix some small issues In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11132 ) Change subject: osmo-config-merge: Fix some small issues ...................................................................... osmo-config-merge: Fix some small issues Allocate NULL context after exit_usage() calls and free it before exit so * sanitizer is happy. Also handle the error cases gracefully when a file is unreadable or formatted wrong. Change-Id: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 --- M utils/osmo-config-merge.c 1 file changed, 15 insertions(+), 4 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/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index c76e42d..a872d64 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -44,6 +44,7 @@ #include #include +#include #include #include @@ -126,8 +127,11 @@ unsigned int line_num = 0; infile = fopen(fname, "r"); - if (!infile) + if (!infile) { + fprintf(stderr, "Could not open file '%s': %s\n", + fname, strerror(errno)); return NULL; + } root = node_alloc(ctx); last = root; @@ -140,7 +144,7 @@ if (indent > cur_indent+1) { fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", fname, line_num); - exit(2); + return NULL; } /* new child to last node */ n = node_alloc_child(last); @@ -229,8 +233,7 @@ const char *base_fname, *patch_fname; struct node *base_tree, *patch_tree; bool debug_enabled = false; - - void *ctx = talloc_named_const(NULL, 0, "root"); + void *ctx; if (argc < 3) exit_usage(1); @@ -245,9 +248,16 @@ exit_usage(1); } + ctx = talloc_named_const(NULL, 0, "root"); + base_tree = file_read(ctx, base_fname); patch_tree = file_read(ctx, patch_fname); + if (!base_tree || ! patch_tree) { + talloc_free(ctx); + return 2; + } + if (debug_enabled) { fprintf(stderr, "====== dumping tree (base)\n"); dump_node(base_tree, stderr, true); @@ -265,6 +275,7 @@ /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */ talloc_free(patch_tree); talloc_free(base_tree); + talloc_free(ctx); return 0; } -- To view, visit https://gerrit.osmocom.org/11132 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: I966e63a3f7d0ff71ee0b88922aa3807d073aa232 Gerrit-Change-Number: 11132 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 22:59:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 22:59:22 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: Add manual page In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11133 ) Change subject: osmo-config-merge: Add manual page ...................................................................... osmo-config-merge: Add manual page Change-Id: Ifaa5afe28779a805764caf76a89efb0a3169942e --- M .gitignore M Makefile.am M configure.ac A man/Makefile.am A man/osmo-config-merge.adoc 5 files changed, 95 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 451c883..cb2ce68 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,7 @@ doc/gb doc/html.tar doc/*.tag +man/*.8 tags src/crc*gen.c diff --git a/Makefile.am b/Makefile.am index de5eb35..745d482 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ diff --git a/configure.ac b/configure.ac index bc3358a..529aad1 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,19 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") +AC_ARG_ENABLE([man-doc], + [AS_HELP_STRING([--disable-man-doc], [Disable man page documentation])], + [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ]) + +AS_IF([test "x$BUILD_MAN" = "xyes"], [ + AC_CHECK_PROG(A2X, [a2x], [yes]) + AS_IF([test "$A2X" != "yes"], + [AC_MSG_ERROR([a2x not found, please install asciidoc or use the + option --disable-man-doc])]) +]) +AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes") +AC_SUBST(BUILD_MAN) + # check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include ]]) @@ -370,6 +383,7 @@ libosmoctrl.pc libosmosim.pc include/Makefile + man/Makefile src/Makefile src/vty/Makefile src/codec/Makefile diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..b287714 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,15 @@ +if BUILD_MAN +man_MANS = osmo-config-merge.8 +endif + +ASCIIDOCS = osmo-config-merge.adoc + +A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir} + +%.8 : %.adoc + a2x ${A2X_OPTS_MANPAGE} $< + +EXTRA_DIST = ${ASCIIDOCS} + +CLEANFILES = \ + osmo-config-merge.8 diff --git a/man/osmo-config-merge.adoc b/man/osmo-config-merge.adoc new file mode 100644 index 0000000..205fb50 --- /dev/null +++ b/man/osmo-config-merge.adoc @@ -0,0 +1,64 @@ +osmo-config-merge(8) +===================== + +NAME +---- +osmo-config-merge - Merge osmocom config snippets into an existing config + +SYNOPSIS +-------- +[verse] +*osmo-config-merge* [--debug] + +DESCRIPTION +----------- +This utility allows you to merge an incremental config "patch" +into an osmocom-style config file. + +The patch file follows the same syntax as the original config file. + +It works by appending the leaf nodes of the patch file to the respective +nodes of the input config file. + +This process allows configuration file changes/updates to be performed +in a more stable/reliable way than by means of (unified) diff files, +as they break every time the context lines break. + +osmo-config-merge doesn't suffer from this problem, as it understands +the tree-like nature of VTY config files. + +The resulting config is printed to stdout. + +NOTE: This only works with configuration files that have proper +indenting, i.e. every level in the hierarchy must be indented excatly +one character, not multiple. + +OPTIONS +------- +*--debug*:: + Show debugging output when parsing the config tree. Needs to be the last argument. + +EXAMPLE USAGE +------------- +[verse] +$ osmo-config-merge osmo-msc.cfg.base osmo-msc_change_network.cfg > osmo-msc.cfg + +EXIT STATUS +----------- +Exit status is 0 if the command was successful, and 1 in case of a +wrong/missing argument. If the tool detects an error in the patch file the +exit status is 2. + +SEE ALSO +-------- +The official Osmocom documentation including the VTY config refernce can be +found at: http://ftp.osmocom.org/docs/latest/ + +The Osmocom wiki is located at: http://projects.osmocom.org/ + + +AUTHORS +------- +osmo-config-merge was written by Harald Welte. + +The man page was written by Daniel Willmann. -- To view, visit https://gerrit.osmocom.org/11133 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: Ifaa5afe28779a805764caf76a89efb0a3169942e Gerrit-Change-Number: 11133 Gerrit-PatchSet: 5 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 Fri Sep 28 23:00:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:00:04 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11140 ) Change subject: 3G+2G.deps: add osmo-sip-connector ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 Gerrit-Change-Number: 11140 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 28 Sep 2018 23:00:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:01:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:01:23 +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_#6012?= Message-ID: <1117588180.364.1538175683425.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.38 KB...] CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC common_vty.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_sim.lo CC card_fs_usim.lo CC reader_pcsc.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC class_tables.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:01:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:01:26 +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_#6012?= Message-ID: <1922532116.365.1538175686356.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 35.90 KB...] CC gsm0503_parity.lo CC gsm0503_coding.lo CC gsm0503_tables.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC fsm_ctrl_commands.lo CC control_cmd.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:02:38 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11060 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: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 28 Sep 2018 23:02:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:02:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:02:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Revert "BSC_Tests: use consistant AMR S0-S15 bits" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11129 ) Change subject: Revert "BSC_Tests: use consistant AMR S0-S15 bits" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11129 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: Ib16d14c723773ce67508c7e6028e594c15779506 Gerrit-Change-Number: 11129 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 23:02: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 Sep 28 23:02:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:02:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Revert "BSC_Tests: use consistant AMR S0-S15 bits" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11129 ) Change subject: Revert "BSC_Tests: use consistant AMR S0-S15 bits" ...................................................................... Revert "BSC_Tests: use consistant AMR S0-S15 bits" The change depends on another change in osmo-bsc, which is not in master yet. Because of this TC_assignment_codec_amr_f and TC_assignment_codec_amr_h are currently failing. So lets revert this patch and re-submit it later. See also: osmo-bsc change I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 This reverts commit 7f5609ad3e65098cca3d79565a1aa80460c49bed. Change-Id: Ib16d14c723773ce67508c7e6028e594c15779506 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 16 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 4a34310..25df52d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1923,10 +1923,6 @@ testcase TC_assignment_codec_amr_f() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; - - /* Note: This setups the codec configuration. The parameter payload in - * mr_conf must be consistant with the parameter codecElements in pars - * and also must match the amr-config in osmo-bsc.cfg! */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1934,14 +1930,11 @@ } }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; - pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; - pars.expect_mr_conf_ie := mr_conf; - f_init(1, true); f_sleep(1.0); + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); + pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1949,8 +1942,6 @@ testcase TC_assignment_codec_amr_h() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; - - /* See note above */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1958,14 +1949,11 @@ } }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; - pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; - pars.expect_mr_conf_ie := mr_conf; - f_init(1, true); f_sleep(1.0); + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/11129 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: Ib16d14c723773ce67508c7e6028e594c15779506 Gerrit-Change-Number: 11129 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 Sep 28 23:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:06:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types: Add support to set L1 Header params during SACCH tx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11147 ) Change subject: L1CTL_Types: Add support to set L1 Header params during SACCH tx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11147 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: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 Gerrit-Change-Number: 11147 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 23:06:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:07:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:07:07 +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_#5863?= Message-ID: <1409076931.366.1538176027095.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.87 KB...] CC gsm0503_tables.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC reader_pcsc.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: 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 Fri Sep 28 23:07:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:07:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5863?= Message-ID: <2044497102.367.1538176028724.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.10 KB...] CC gsm0503_interleaving.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_vty.lo CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC class_tables.lo CC card_fs_isim.lo CC reader_pcsc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: 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 Fri Sep 28 23:07:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:07:33 +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_#1534?= Message-ID: <810908088.368.1538176053894.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.57 KB...] CC gsm0503_tables.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_ns.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CC control_if.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:07:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:07: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_#1534?= Message-ID: <541233564.369.1538176064318.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.58 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC card_fs_sim.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CC osmo_config_merge-osmo-config-merge.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: 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 Fri Sep 28 23:07:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:07:59 +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_#5864?= In-Reply-To: <1409076931.366.1538176027095.JavaMail.jenkins@jenkins.osmocom.org> References: <1409076931.366.1538176027095.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <472938990.370.1538176079181.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 37.53 KB...] CC gsm0503_parity.lo CC gsm0503_mapping.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_bss.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC fsm_ctrl_commands.lo CC control_vty.lo CC control_if.lo CC control_cmd.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_sim.lo CC class_tables.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_sim_test-osmo-sim-test.o CC osmo_config_merge-osmo-config-merge.o CC osmo-auc-gen.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: 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 Fri Sep 28 23:08:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:08:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5864?= In-Reply-To: <2044497102.367.1538176028724.JavaMail.jenkins@jenkins.osmocom.org> References: <2044497102.367.1538176028724.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1858241897.371.1538176086082.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 44.75 KB...] CC gsm0503_tables.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC card_fs_uicc.lo CC reader.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CC osmo_config_merge-osmo-config-merge.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:08:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:08:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11148 ) Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11148/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11148/1/bts/BTS_Tests.ttcn at 1169 PS1, Line 1169: l1header := valueof(ts_SACCH_L1_HEADER(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), > This is another improvement of the test, and I agree it makes sense but it can be done in a later pa [?] It's also a question on what we want to test here, and how much of the normal MS behavior we want to emulate. I'm not sure at this point... -- To view, visit https://gerrit.osmocom.org/11148 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: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 23:08:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:09:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09:22 +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_#5865?= In-Reply-To: <472938990.370.1538176079181.JavaMail.jenkins@jenkins.osmocom.org> References: <472938990.370.1538176079181.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <207988452.372.1538176162213.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 46.17 KB...] CC gsm0503_tables.lo CC gsm0503_coding.lo CC gsm0503_interleaving.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_vty.lo CC common_vty.lo CC gprs_ns.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC gprs_ns_frgre.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_usim.lo CC card_fs_sim.lo CC class_tables.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: warning: relinking `libosmosim.la' libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CC osmo_config_merge-osmo-config-merge.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: 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 Fri Sep 28 23:09:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09:22 +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_#6013?= In-Reply-To: <1117588180.364.1538175683425.JavaMail.jenkins@jenkins.osmocom.org> References: <1117588180.364.1538175683425.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1472455577.373.1538176162425.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 46.98 KB...] CC gsm0503_coding.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_ns_vty.lo CC gprs_ns.lo CC gprs_ns_frgre.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC fsm_ctrl_commands.lo CC control_cmd.lo CC control_vty.lo CC control_if.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: 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 Fri Sep 28 23:09:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09:25 +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_#6013?= In-Reply-To: <1922532116.365.1538175686356.JavaMail.jenkins@jenkins.osmocom.org> References: <1922532116.365.1538175686356.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <802991222.374.1538176165517.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 46.50 KB...] CC gsm0503_interleaving.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_util.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_uicc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CC osmo_config_merge-osmo-config-merge.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:09:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5865?= In-Reply-To: <1858241897.371.1538176086082.JavaMail.jenkins@jenkins.osmocom.org> References: <1858241897.371.1538176086082.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <702645127.375.1538176169582.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 55.16 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:09:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09:37 +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_#3633?= Message-ID: <701872702.376.1538176177721.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 37.71 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:09:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09:38 +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_#2859?= Message-ID: <914645665.377.1538176178881.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 42.46 KB...] CC gsm0503_tables.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_ns_frgre.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC control_vty.lo CC fsm_ctrl_commands.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC reader.lo CC core.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-auc-gen.o CC osmo_sim_test-osmo-sim-test.o CC osmo-arfcn.o CC osmo_config_merge-osmo-config-merge.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: 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 Fri Sep 28 23:09:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:09: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_#2859?= Message-ID: <1018227262.378.1538176188879.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 42.45 KB...] CC gsm0503_interleaving.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_util.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC card_fs_uicc.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_sim.lo CC reader_pcsc.lo CC reader.lo CC class_tables.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:11:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:11:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11149 ) Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11149/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11149/1/bts/BTS_Tests.ttcn at 1371 PS1, Line 1371: f_L1CTL_PARAM(L1CTL, ta, tx_power); > Why do we need both variables? [?] In the context of "developer economy", let's please not debate such topics. Some people like to use a local variable to shorten the line length, others don't. Especially in this example, both variants are equally readable. -- To view, visit https://gerrit.osmocom.org/11149 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: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 23:11:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:12:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:12:20 +0000 Subject: Change in osmo-msc[master]: fix a use-after-free in msc_mgcp.c:_handle_error() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11146 ) Change subject: fix a use-after-free in msc_mgcp.c:_handle_error() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11146 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: I5df17c19e2a68c019f7eaf582b14585caa54b32a Gerrit-Change-Number: 11146 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 28 Sep 2018 23:12: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 Sep 28 23:12:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:12:21 +0000 Subject: Change in osmo-msc[master]: fix a use-after-free in msc_mgcp.c:_handle_error() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11146 ) Change subject: fix a use-after-free in msc_mgcp.c:_handle_error() ...................................................................... fix a use-after-free in msc_mgcp.c:_handle_error() Move code which needs to test the mgcp_ctx->free_ctx flag upwards such that it runs before we're calling functions which will potentially free mgcp_ctx. The code being moved up takes effect only in case mgcp_ctx won't be freed, so there should be no functional difference. Change-Id: I5df17c19e2a68c019f7eaf582b14585caa54b32a Related: OS#2885 --- M src/libmsc/msc_mgcp.c 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index e58b249..acdb785 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -183,6 +183,16 @@ LOGPFSMLSRC(mgcp_ctx->fsm, LOGL_ERROR, file, line, "%s -- graceful shutdown...\n", get_value_string(msc_mgcp_cause_codes_names, cause)); + /* Request the higher layers (gsm_04_08.c) to release the call. If the + * problem occured after msc_mgcp_call_release() was calls, remain + * silent because we already got informed and the higher layers might + * already freed their context information (trans). */ + if (!mgcp_ctx->free_ctx) { + mncc_set_cause(&mncc, GSM48_CAUSE_LOC_TRANS_NET, + GSM48_CC_CAUSE_RESOURCE_UNAVAIL); + mncc_tx_to_cc(mgcp_ctx->trans->net, MNCC_REL_REQ, &mncc); + } + /* For the shutdown we have two options. Whenever it makes sense to * send a DLCX to the MGW in order to be sure that the connection is * properly cleaned up, the dlcx flag should be set. In other cases @@ -205,16 +215,6 @@ osmo_fsm_inst_state_chg(fi, ST_HALT, 0, 0); osmo_fsm_inst_dispatch(fi, EV_TEARDOWN_ERROR, mgcp_ctx); } - - /* Request the higher layers (gsm_04_08.c) to release the call. If the - * problem occured after msc_mgcp_call_release() was calls, remain - * silent because we already got informed and the higher layers might - * already freed their context information (trans). */ - if (!mgcp_ctx->free_ctx) { - mncc_set_cause(&mncc, GSM48_CAUSE_LOC_TRANS_NET, - GSM48_CC_CAUSE_RESOURCE_UNAVAIL); - mncc_tx_to_cc(mgcp_ctx->trans->net, MNCC_REL_REQ, &mncc); - } } /* Timer callback to shut down in case of connectivity problems */ -- To view, visit https://gerrit.osmocom.org/11146 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: I5df17c19e2a68c019f7eaf582b14585caa54b32a Gerrit-Change-Number: 11146 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling 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 Fri Sep 28 23:12:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:12:46 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: drop redundant tn validation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11145 ) Change subject: trxcon/sched_prim.c: drop redundant tn validation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11145 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: I553b4cc39b2efd7b60346160c57f01ee4cf066be Gerrit-Change-Number: 11145 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 23:12: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 Sep 28 23:12:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:12:47 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: drop redundant tn validation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11145 ) Change subject: trxcon/sched_prim.c: drop redundant tn validation ...................................................................... trxcon/sched_prim.c: drop redundant tn validation Change-Id: I553b4cc39b2efd7b60346160c57f01ee4cf066be --- M src/host/trxcon/sched_prim.c 1 file changed, 0 insertions(+), 4 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 e03f93f..2067900 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -102,10 +102,6 @@ /* Determine TS index */ tn = chan_nr & 0x7; - if (tn > 7) { - LOGP(DSCH, LOGL_ERROR, "Incorrect TS index %u\n", tn); - return -EINVAL; - } /* Check whether required timeslot is allocated and configured */ ts = trx->ts_list[tn]; -- To view, visit https://gerrit.osmocom.org/11145 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: I553b4cc39b2efd7b60346160c57f01ee4cf066be Gerrit-Change-Number: 11145 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy 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 Sep 28 23:15:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:15:49 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 4: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c at 255 PS4, Line 255: llist_for_each_entry(prim, queue, list) { I think it would be more elegant to have a second queue for SACCH so we don't have to scan the (shared) queue and filter for SACCH messages, but simply can directly look at a queue containing only "relevant" messages. But that's just a matter of taste and doesn't have to happen at all, particularly not in this patch. -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 23:15:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:15:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:15:58 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... trxcon/scheduler: fix Measurement Reporting on SACCH According to 3GPP TS 04.08, section 3.4.1, SACCH logical channel accompanies either a traffic or a signaling channel. It has the particularity that continuous transmission must occur in both directions, so on the Uplink direction measurement result messages are sent at each possible occasion when nothing else has to be sent. The LAPDm fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not applicable on SACCH channels! Unfortunately, 3GPP TS 04.08 doesn't clearly state which "else messages" besides Measurement Reports can be send by the MS on SACCH channels. However, in sub-clause 3.4.1 it's stated that the interval between two successive measurement result messages shall not exceed one L2 frame. This change introduces a separate handler for SACCH primitives, which dequeues a SACCH primitive from transmit queue, if present. Otherwise it dequeues a cached Measurement Report (the last received one). Finally, if the cache is empty, a "dummy" measurement report is used. When it's possible, a non-MR primitive is prioritized. Change-Id: If1b8dc74ced746d6270676fdde75fcda32f91a3d Related: OS#2988 --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 211 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 2067900..275a050 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -122,6 +122,194 @@ return 0; } +/** + * Composes a new primitive using either cached (if populated), + * or "dummy" Measurement Report message. + * + * @param lchan lchan to assign a primitive + * @return SACCH primitive to be transmitted + */ +static struct trx_ts_prim *prim_compose_mr(struct trx_lchan_state *lchan) +{ + struct trx_ts_prim *prim; + uint8_t *mr_src_ptr; + bool cached; + int rc; + + /* "Dummy" Measurement Report */ + static const uint8_t meas_rep_dummy[] = { + /* L1 SACCH pseudo-header */ + 0x0f, 0x00, + + /* LAPDm header */ + 0x01, 0x03, 0x49, + + /* Measurement report */ + 0x06, 0x15, 0x36, 0x36, 0x01, 0xC0, + + /* TODO: Padding? Randomize if so */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; + + /* Allocate a new primitive */ + rc = sched_prim_init(lchan, &prim, GSM_MACBLOCK_LEN, + trx_lchan_desc[lchan->type].chan_nr, TRX_CH_LID_SACCH); + OSMO_ASSERT(rc == 0); + + /* Check if the MR cache is populated (verify LAPDm header) */ + cached = (lchan->sacch.mr_cache[2] != 0x00 + && lchan->sacch.mr_cache[3] != 0x00 + && lchan->sacch.mr_cache[4] != 0x00); + if (cached) { /* Use the cached one */ + mr_src_ptr = lchan->sacch.mr_cache; + lchan->sacch.mr_cache_usage++; + } else { /* Use "dummy" one */ + mr_src_ptr = (uint8_t *) meas_rep_dummy; + } + + /* Compose a new Measurement Report primitive */ + memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN); + +#if 0 + /** + * Update the L1 SACCH pseudo-header (only for cached MRs) + * + * FIXME: this would require having access to the trx_instance, + * what can be achieved either by chain-passing the pointer + * through sched_prim_dequeue(), or by adding some + * back-pointers to the logical channel state. + * + * TODO: filling of the actual values into cached Measurement + * Reports would break the distance spoofing feature. If it + * were known whether the spoofing is enabled or not, we could + * decide whether to update the cached L1 SACCH header here. + */ + if (!cached) { + prim->payload[0] = trx->tx_power; + prim->payload[1] = trx->ta; + } +#endif + + /* Inform about the cache usage count */ + if (cached && lchan->sacch.mr_cache_usage > 5) { + LOGP(DSCHD, LOGL_NOTICE, "SACCH MR cache usage count=%u > 5 " + "on lchan=%s => ancient measurements, please fix!\n", + lchan->sacch.mr_cache_usage, + trx_lchan_desc[lchan->type].name); + } + + LOGP(DSCHD, LOGL_NOTICE, "Using a %s Measurement Report " + "on lchan=%s\n", (cached ? "cached" : "dummy"), + trx_lchan_desc[lchan->type].name); + + return prim; +} + +/** + * Dequeues a SACCH primitive from transmit queue, if present. + * Otherwise dequeues a cached Measurement Report (the last + * received one). Finally, if the cache is empty, a "dummy" + * measurement report is used. + * + * According to 3GPP TS 04.08, section 3.4.1, SACCH channel + * accompanies either a traffic or a signaling channel. It + * has the particularity that continuous transmission must + * occur in both directions, so on the Uplink direction + * measurement result messages are sent at each possible + * occasion when nothing else has to be sent. The LAPDm + * fill frames (0x01, 0x03, 0x01, 0x2b, ...) are not + * applicable on SACCH channels! + * + * Unfortunately, 3GPP TS 04.08 doesn't clearly state + * which "else messages" besides Measurement Reports + * can be send by the MS on SACCH channels. However, + * in sub-clause 3.4.1 it's stated that the interval + * between two successive measurement result messages + * shall not exceed one L2 frame. + * + * @param queue transmit queue to take a prim from + * @param lchan lchan to assign a primitive + * @return SACCH primitive to be transmitted + */ +static struct trx_ts_prim *prim_dequeue_sacch(struct llist_head *queue, + struct trx_lchan_state *lchan) +{ + struct trx_ts_prim *prim_nmr = NULL; + struct trx_ts_prim *prim_mr = NULL; + struct trx_ts_prim *prim; + bool mr_now; + + /* Shall we transmit MR now? */ + mr_now = !lchan->sacch.mr_tx_last; + +#define PRIM_IS_MR(prim) \ + (prim->payload[5] == GSM48_PDISC_RR \ + && prim->payload[6] == GSM48_MT_RR_MEAS_REP) + + /* Iterate over all primitives in the queue */ + llist_for_each_entry(prim, queue, list) { + /* We are looking for particular channel */ + if (prim->chan != lchan->type) + continue; + + /* Just to be sure... */ + if (prim->payload_len != GSM_MACBLOCK_LEN) + continue; + + /* Look for a Measurement Report */ + if (!prim_mr && PRIM_IS_MR(prim)) + prim_mr = prim; + + /* Look for anything else */ + if (!prim_nmr && !PRIM_IS_MR(prim)) + prim_nmr = prim; + + /* Should we look further? */ + if (mr_now && prim_mr) + break; /* MR was found */ + else if (!mr_now && prim_nmr) + break; /* something else was found */ + } + + LOGP(DSCHD, LOGL_DEBUG, "SACCH MR selection on lchan=%s: " + "mr_tx_last=%d prim_mr=%p prim_nmr=%p\n", + trx_lchan_desc[lchan->type].name, + lchan->sacch.mr_tx_last, + prim_mr, prim_nmr); + + /* Prioritize non-MR prim if possible */ + if (mr_now && prim_mr) + prim = prim_mr; + else if (!mr_now && prim_nmr) + prim = prim_nmr; + else if (!mr_now && prim_mr) + prim = prim_mr; + else /* Nothing was found */ + prim = NULL; + + /* Have we found what we were looking for? */ + if (prim) /* Dequeue if so */ + llist_del(&prim->list); + else /* Otherwise compose a new MR */ + prim = prim_compose_mr(lchan); + + /* Update the cached report */ + if (prim == prim_mr) { + memcpy(lchan->sacch.mr_cache, + prim->payload, GSM_MACBLOCK_LEN); + lchan->sacch.mr_cache_usage = 0; + + LOGP(DSCHD, LOGL_DEBUG, "SACCH MR cache has been updated " + "for lchan=%s\n", trx_lchan_desc[lchan->type].name); + } + + /* Update the MR transmission state */ + lchan->sacch.mr_tx_last = PRIM_IS_MR(prim); + + return prim; +} + /* 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) @@ -285,6 +473,10 @@ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, uint32_t fn, struct trx_lchan_state *lchan) { + /* SACCH is unorthodox, see 3GPP TS 04.08, section 3.4.1 */ + if (CHAN_IS_SACCH(lchan->type)) + return prim_dequeue_sacch(queue, lchan); + /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; @@ -346,6 +538,8 @@ /* Make sure that there is no existing primitive */ OSMO_ASSERT(lchan->prim == NULL); + /* Not applicable for SACCH! */ + OSMO_ASSERT(!CHAN_IS_SACCH(lchan->type)); /** * Determine what actually should be generated: @@ -360,18 +554,8 @@ /* FIXME: should we do anything for CSD? */ return 0; } else { - uint8_t *cur = prim_buffer; - - if (CHAN_IS_SACCH(chan)) { - /* Add 2-byte SACCH header */ - /* FIXME: How to get TA and MS Tx Power from l1l->trx->tx_power + l1l->trx->ta? */ - cur[0] = cur[1] = 0x00; - cur += 2; - } - - /* Copy a fill frame payload */ - memcpy(cur, lapdm_fill_frame, sizeof(lapdm_fill_frame)); - cur += sizeof(lapdm_fill_frame); + /* Copy LAPDm fill frame's header */ + memcpy(prim_buffer, lapdm_fill_frame, sizeof(lapdm_fill_frame)); /** * TS 144.006, section 5.2 "Frame delimitation and fill bits" @@ -379,7 +563,7 @@ * be set to the binary value "00101011", each fill bit should * be set to a random value when sent by the network. */ - for (i = cur - prim_buffer; i < GSM_MACBLOCK_LEN; i++) + for (i = sizeof(lapdm_fill_frame); i < GSM_MACBLOCK_LEN; i++) prim_buffer[i] = (uint8_t) rand(); /* Define a prim length */ diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index fc29998..0b83af3 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -460,7 +460,7 @@ /* Forget the current prim */ sched_prim_drop(lchan); - /* TCH specific variables */ + /* Channel specific stuff */ if (CHAN_IS_TCH(lchan->type)) { lchan->dl_ongoing_facch = 0; lchan->ul_facch_blocks = 0; @@ -469,6 +469,9 @@ /* Reset AMR state */ memset(&lchan->amr, 0x00, sizeof(lchan->amr)); + } else if (CHAN_IS_SACCH(lchan->type)) { + /* Reset SACCH state */ + memset(&lchan->sacch, 0x00, sizeof(lchan->sacch)); } /* Reset ciphering state */ diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 818c95a..10ae256 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -186,6 +186,16 @@ int32_t toa256_sum; } meas; + /*! \brief SACCH state */ + struct { + /*! \brief Cached measurement report (last received) */ + uint8_t mr_cache[GSM_MACBLOCK_LEN]; + /*! \brief Cache usage counter */ + uint8_t mr_cache_usage; + /*! \brief Was a MR transmitted last time? */ + bool mr_tx_last; + } sacch; + /* AMR specific */ struct { /*! \brief 4 possible codecs for AMR */ -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:16:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:16:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5866?= In-Reply-To: <702645127.375.1538176169582.JavaMail.jenkins@jenkins.osmocom.org> References: <702645127.375.1538176169582.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <723786331.379.1538176574941.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 38.07 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo_sim_test-osmo-sim-test.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:16:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:16:15 +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_#6014?= In-Reply-To: <1472455577.373.1538176162425.JavaMail.jenkins@jenkins.osmocom.org> References: <1472455577.373.1538176162425.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <784920075.380.1538176575292.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Stefan Sperling] fix a use-after-free in msc_mgcp.c:_handle_error() ------------------------------------------ [...truncated 39.66 KB...] CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: 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 Fri Sep 28 23:16:19 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:16:19 +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_#5866?= In-Reply-To: <207988452.372.1538176162213.JavaMail.jenkins@jenkins.osmocom.org> References: <207988452.372.1538176162213.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2081811297.381.1538176579917.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 46.82 KB...] CC gsm0503_coding.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp_vty.lo CC gprs_ns_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CC control_if.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader_pcsc.lo CC reader.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: 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 Fri Sep 28 23:16:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:16: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_#6014?= In-Reply-To: <802991222.374.1538176165517.JavaMail.jenkins@jenkins.osmocom.org> References: <802991222.374.1538176165517.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1249921742.382.1538176580588.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Stefan Sperling] fix a use-after-free in msc_mgcp.c:_handle_error() ------------------------------------------ [...truncated 47.15 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:904: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:16:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:16:57 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11102 ) Change subject: ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11102 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: I8e28d7c011f466d0eb2127f61032978c4e0bf16d Gerrit-Change-Number: 11102 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 23:16: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 Sep 28 23:17:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:17:56 +0000 Subject: Change in osmo-trx[master]: Use pthread_setname_np to name threads In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11047 ) Change subject: Use pthread_setname_np to name threads ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11047 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: I84711739c3e224cb383fd12b6db933785b28209e Gerrit-Change-Number: 11047 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 28 Sep 2018 23:17: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 Sep 28 23:17:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:17:57 +0000 Subject: Change in osmo-trx[master]: Use pthread_setname_np to name threads In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11047 ) Change subject: Use pthread_setname_np to name threads ...................................................................... Use pthread_setname_np to name threads osmo-trx can start a considerable amount of threads that can make debugging it challenging at least. By using phtread_setname_np, the system sets a meaningful name to the thread which can be seen while debugging with gdb or by printing /proc/$pid/task/$tid/comm. Now we also log system TID when setting the name so we can identify different tasks in /proc even if pthread_setname_np fails. Change-Id: I84711739c3e224cb383fd12b6db933785b28209e --- M CommonLibs/Threads.cpp M CommonLibs/Threads.h M Transceiver52M/Transceiver.cpp M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/radioInterface.cpp M tests/CommonLibs/Makefile.am 6 files changed, 43 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/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index de6520b..2988e12 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -24,11 +24,17 @@ */ - - +#include +#include #include "Threads.h" #include "Timeval.h" +#include "Logger.h" + +#ifndef gettid +#include +#define gettid() syscall(SYS_gettid) +#endif using namespace std; @@ -102,6 +108,19 @@ pthread_cond_timedwait(&mSignal,&wMutex.mMutex,&waitTime); } +void set_selfthread_name(const char *name) +{ + pthread_t selfid = pthread_self(); + pid_t tid = gettid(); + if (pthread_setname_np(selfid, name) == 0) { + LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name; + } else { + char buf[256]; + int err = errno; + char* err_str = strerror_r(err, buf, sizeof(buf)); + LOG(NOTICE) << "Thread "<< selfid << " (task " << tid << ") set name \"" << name << "\" failed: (" << err << ") " << err_str; + } +} void Thread::start(void *(*task)(void*), void *arg) { diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h index 47c7275..857c5d9 100644 --- a/CommonLibs/Threads.h +++ b/CommonLibs/Threads.h @@ -141,6 +141,8 @@ #define START_THREAD(thread,function,argument) \ thread.start((void *(*)(void*))function, (void*)argument); +void set_selfthread_name(const char *name); + /** A C++ wrapper for pthread threads. */ class Thread { diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index cdfd79d..076db3e 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1044,11 +1044,15 @@ void *RxUpperLoopAdapter(TransceiverChannel *chan) { + char thread_name[16]; Transceiver *trx = chan->trx; size_t num = chan->num; delete chan; + snprintf(thread_name, 16, "RxUpper%zu", num); + set_selfthread_name(thread_name); + trx->setPriority(0.42); while (1) { @@ -1060,6 +1064,8 @@ void *RxLowerLoopAdapter(Transceiver *transceiver) { + set_selfthread_name("RxLower"); + transceiver->setPriority(0.45); while (1) { @@ -1071,6 +1077,8 @@ void *TxLowerLoopAdapter(Transceiver *transceiver) { + set_selfthread_name("TxLower"); + transceiver->setPriority(0.44); while (1) { @@ -1082,11 +1090,15 @@ void *ControlServiceLoopAdapter(TransceiverChannel *chan) { + char thread_name[16]; Transceiver *trx = chan->trx; size_t num = chan->num; delete chan; + snprintf(thread_name, 16, "CtrlService%zu", num); + set_selfthread_name(thread_name); + while (1) { trx->driveControl(num); pthread_testcancel(); @@ -1096,11 +1108,15 @@ void *TxUpperLoopAdapter(TransceiverChannel *chan) { + char thread_name[16]; Transceiver *trx = chan->trx; size_t num = chan->num; delete chan; + snprintf(thread_name, 16, "TxUpper%zu", num); + set_selfthread_name(thread_name); + trx->setPriority(0.40); while (1) { diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index b7109a4..c30f3a7 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -322,6 +322,7 @@ void *async_event_loop(uhd_device *dev) { + set_selfthread_name("UHDAsyncEvent"); dev->setPriority(0.43); while (1) { diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 7d6a03b..0f949d7 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -148,6 +148,7 @@ /** synchronization thread loop */ void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface) { + set_selfthread_name("AlignRadio"); while (1) { sleep(60); radioInterface->alignRadio(); diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am index 4543c72..2a9a021 100644 --- a/tests/CommonLibs/Makefile.am +++ b/tests/CommonLibs/Makefile.am @@ -28,11 +28,11 @@ InterthreadTest_SOURCES = InterthreadTest.cpp InterthreadTest_LDADD = $(COMMON_LA) -InterthreadTest_LDFLAGS = -lpthread +InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS) SocketsTest_SOURCES = SocketsTest.cpp SocketsTest_LDADD = $(COMMON_LA) -SocketsTest_LDFLAGS = -lpthread +SocketsTest_LDFLAGS = -lpthread $(AM_LDFLAGS) TimevalTest_SOURCES = TimevalTest.cpp TimevalTest_LDADD = $(COMMON_LA) -- To view, visit https://gerrit.osmocom.org/11047 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: I84711739c3e224cb383fd12b6db933785b28209e Gerrit-Change-Number: 11047 Gerrit-PatchSet: 2 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 Fri Sep 28 23:18:10 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 28 Sep 2018 23:18:10 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Fix missing Security Command for 3G when attaching Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11150 Change subject: gprs_gmm: Fix missing Security Command for 3G when attaching ...................................................................... gprs_gmm: Fix missing Security Command for 3G when attaching Introduce a new FSM step in GMM Attach to send the Security Command to the RNC after completing the Authentication. Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM") Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db --- M include/osmocom/sgsn/gprs_gmm_attach.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c 3 files changed, 43 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/50/11150/1 diff --git a/include/osmocom/sgsn/gprs_gmm_attach.h b/include/osmocom/sgsn/gprs_gmm_attach.h index 22fbd6f..0aa2123 100644 --- a/include/osmocom/sgsn/gprs_gmm_attach.h +++ b/include/osmocom/sgsn/gprs_gmm_attach.h @@ -11,6 +11,7 @@ ST_RETRIEVE_AUTH, ST_AUTH, ST_ASK_VLR, + ST_IU_SECURITY_CMD, ST_ACCEPT, ST_REJECT }; @@ -20,6 +21,7 @@ E_IDEN_RESP_RECV, E_AUTH_RESP_RECV_SUCCESS, E_AUTH_RESP_RECV_RESYNC, + E_IU_SECURITY_CMD_COMPLETE, E_ATTACH_ACCEPTED, E_ATTACH_ACCEPT_SENT, E_ATTACH_COMPLETE_RECV, diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index a363c70..9dad9a7 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -205,7 +205,7 @@ REQUIRE_MM /* Continue authentication here */ mm->iu.ue_ctx->integrity_active = 1; - rc = gsm48_gmm_authorize(mm); + osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL); break; default: LOGP(DRANAP, LOGL_NOTICE, "Unknown event received: %i\n", type); diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 272fec7..e77faa4 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -157,7 +157,11 @@ switch (event) { case E_AUTH_RESP_RECV_SUCCESS: sgsn_auth_request(ctx); - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + if (ctx->ran_type == MM_CTX_T_UTRAN_Iu && !ctx->iu.ue_ctx->integrity_active) { + osmo_fsm_inst_state_chg(fi, ST_IU_SECURITY_CMD, sgsn->cfg.timers.T3350, 3350); + } else { + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + } break; case E_AUTH_RESP_RECV_RESYNC: if (ctx->gmm_att_req.auth_reattempt <= 1) @@ -228,6 +232,32 @@ } } +static void st_iu_security_cmd_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ +#ifdef BUILD_IU + struct sgsn_mm_ctx *ctx = fi->priv; + int rc = 0; + + /* TODO: shouldn't this set always? not only when the integrity_active? */ + if (ctx->iu.ue_ctx->integrity_active) { + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + return; + } + + ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, 0, ctx->iu.new_key); + ctx->iu.new_key = 0; +#endif +} + +static void st_iu_security_cmd(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_IU_SECURITY_CMD_COMPLETE: + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + break; + } +} + static struct osmo_fsm_state gmm_attach_req_fsm_states[] = { /* default state for non-DTX and DTX when SPEECH is in progress */ [ST_INIT] = { @@ -252,11 +282,18 @@ }, [ST_AUTH] = { .in_event_mask = X(E_AUTH_RESP_RECV_SUCCESS) | X(E_AUTH_RESP_RECV_RESYNC), - .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_IU_SECURITY_CMD) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT), .name = "Authenticate", .onenter = st_auth_on_enter, .action = st_auth, }, + [ST_IU_SECURITY_CMD] = { + .in_event_mask = X(E_IU_SECURITY_CMD_COMPLETE), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_REJECT), + .name = "IuSecurityCommand", + .onenter = st_iu_security_cmd_on_enter, + .action = st_iu_security_cmd, + }, [ST_ACCEPT] = { .in_event_mask = X(E_ATTACH_COMPLETE_RECV), .out_state_mask = X(ST_INIT) | X(ST_REJECT), @@ -280,6 +317,7 @@ { E_ATTACH_ACCEPTED, "Attach accepted" }, { E_ATTACH_ACCEPT_SENT, "Attach accept sent" }, { E_ATTACH_COMPLETE_RECV, "Attach complete received." }, + { E_IU_SECURITY_CMD_COMPLETE, "IU Security Command Complete received." }, { E_REJECT, "Reject the MS"}, { E_VLR_ANSWERED, "VLR answered"}, { 0, NULL } -- To view, visit https://gerrit.osmocom.org/11150 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: I1e12b0a32e58c6f78dba7b548f7d7016567229db Gerrit-Change-Number: 11150 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:18:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:18:23 +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 2: Code-Review+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: 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: Fri, 28 Sep 2018 23:18: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 Sep 28 23:18:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:18:24 +0000 Subject: Change in osmo-bsc[master]: fix unaligned access in abis_nm_rx_ipacc() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( 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, 2 insertions(+), 3 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/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 4757c72..7f919a4 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 @@ -2662,9 +2663,7 @@ 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)))); + DEBUGPC(DNM, "PORT=%" SCNu16 " ", osmo_load16be(TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP_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: merged Gerrit-Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 Gerrit-Change-Number: 10645 Gerrit-PatchSet: 3 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 Fri Sep 28 23:19:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:19:33 +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-1 now that we have osmo-config-merge, this patch could be rewritten in a more stable way by not containing full config files but only those few parameters that actually matter in terms of config extraction -- 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, 28 Sep 2018 23:19: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 Sep 28 23:20:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:20:21 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: any interest in reworking this as suggested? -- To view, visit https://gerrit.osmocom.org/9202 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: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 28 Sep 2018 23:20:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:23:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:23:30 +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_#3634?= In-Reply-To: <701872702.376.1538176177721.JavaMail.jenkins@jenkins.osmocom.org> References: <701872702.376.1538176177721.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2136917915.383.1538177010078.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] fix unaligned access in abis_nm_rx_ipacc() ------------------------------------------ [...truncated 35.06 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_bss.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-sim-test CCLD osmo-auc-gen CCLD osmo-config-merge make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 make[2]: *** [osmo-config-merge.8] Error 1 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:25:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:25:27 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10033 ) Change subject: gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL ...................................................................... gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL NET_FAIL will result in asking again and again. Reject with IMPL_DETACHED to drop the MS completely. Change-Id: I195d533e330a4b577cad80c7e757d481f9c837df --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index a363c70..a86fe2b 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1862,7 +1862,7 @@ ctx = sgsn_mm_ctx_by_imsi(mi_string); if (!ctx) { /* FIXME: We need to have a context for service request? */ - reject_cause = GMM_CAUSE_NET_FAIL; + reject_cause = GMM_CAUSE_IMPL_DETACHED; goto rejected; } msgid2mmctx(ctx, msg); @@ -1875,7 +1875,7 @@ ctx = sgsn_mm_ctx_by_ptmsi(tmsi); if (!ctx) { /* FIXME: We need to have a context for service request? */ - reject_cause = GMM_CAUSE_NET_FAIL; + reject_cause = GMM_CAUSE_IMPL_DETACHED; goto rejected; } msgid2mmctx(ctx, msg); -- To view, visit https://gerrit.osmocom.org/10033 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: I195d533e330a4b577cad80c7e757d481f9c837df Gerrit-Change-Number: 10033 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:27:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:27:18 +0000 Subject: Change in osmo-tetra[master]: add traffic dumping patch, use getopt to parse arguments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10264 ) Change subject: add traffic dumping patch, use getopt to parse arguments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10264 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: I94135753a76cadfa373167ffca18e89bee5bcff8 Gerrit-Change-Number: 10264 Gerrit-PatchSet: 1 Gerrit-Owner: Jan Hrach Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 23: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 Fri Sep 28 23:27:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:27:20 +0000 Subject: Change in osmo-tetra[master]: add traffic dumping patch, use getopt to parse arguments In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10264 ) Change subject: add traffic dumping patch, use getopt to parse arguments ...................................................................... add traffic dumping patch, use getopt to parse arguments Enable the user to specify a directory, where contents of traffic channel will be saved. Together with this dump, a text file with SSIs of the engaged stations is saved too. Based on 0004-HACK-Quick-hack-to-save-the-speech-data-from-TCH.patch available at https://build.opensuse.org/package/view_file/home:mnhauke:sdr/osmo-tetra/0004-HACK-Quick-hack-to-save-the-speech-data-from-TCH.patch Change-Id: I94135753a76cadfa373167ffca18e89bee5bcff8 --- M src/lower_mac/tetra_lower_mac.c M src/tetra-rx.c M src/tetra_common.h M src/tetra_gsmtap.c M src/tetra_gsmtap.h M src/tetra_upper_mac.c 6 files changed, 84 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index 1e8f2e8..d6f9e41 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -184,6 +185,48 @@ DEBUGP("%s %s type4: %s\n", tbp->name, time_str, osmo_ubit_dump(type4, tbp->type345_bits)); + /* If this is a traffic channel, dump. */ + if ((type == TPSAP_T_SCH_F) && tms->cur_burst.is_traffic && tms->dumpdir) { + char fname[PATH_MAX]; + int16_t block[690]; + FILE *f; + int i; + + /* Open target file */ + snprintf(fname, sizeof(fname), "%s/traffic_%d_%d.out", tms->dumpdir, + tms->cur_burst.is_traffic, tms->tsn); + f = fopen(fname, "ab"); + + /* Generate a block */ + memset(block, 0x00, sizeof(int16_t) * 690); + for (i = 0; i < 6; i++) + block[115*i] = 0x6b21 + i; + + for (i = 0; i < 114; i++) + block[1+i] = type4[i] ? -127 : 127; + + for (i = 0; i < 114; i++) + block[116+i] = type4[114+i] ? -127 : 127; + + for (i = 0; i < 114; i++) + block[231+i] = type4[228+i] ? -127 : 127; + + for (i = 0; i < 90; i++) + block[346+i] = type4[342+i] ? -127 : 127; + + /* Write it */ + fwrite(block, sizeof(int16_t), 690, f); + + fclose(f); + + /* Write used ssi */ + snprintf(fname, sizeof(fname), "%s/traffic_%d_%d.txt", tms->dumpdir, + tms->cur_burst.is_traffic, tms->tsn); + f = fopen(fname, "a"); + fprintf(f, "%d\n", tms->ssi); + fclose(f); + } + if (tbp->interleave_a) { /* Run block deinterleaving: type-3 bits */ block_deinterleave(tbp->type345_bits, tbp->interleave_a, type4, type3); diff --git a/src/tetra-rx.c b/src/tetra-rx.c index c751772..ed4d252 100644 --- a/src/tetra-rx.c +++ b/src/tetra-rx.c @@ -39,28 +39,39 @@ int main(int argc, char **argv) { int fd; + int opt; struct tetra_rx_state *trs; struct tetra_mac_state *tms; - if (argc < 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); - exit(1); - } - - fd = open(argv[1], O_RDONLY); - if (fd < 0) { - perror("open"); - exit(2); - } - - tetra_gsmtap_init("localhost", 0); - tms = talloc_zero(tetra_tall_ctx, struct tetra_mac_state); tetra_mac_state_init(tms); trs = talloc_zero(tetra_tall_ctx, struct tetra_rx_state); trs->burst_cb_priv = tms; + while ((opt = getopt(argc, argv, "d:")) != -1) { + switch (opt) { + case 'd': + tms->dumpdir = strdup(optarg); + break; + default: + fprintf(stderr, "Unknown option %c\n", opt); + } + } + + if (argc <= optind) { + fprintf(stderr, "Usage: %s [-d DUMPDIR] \n", argv[0]); + exit(1); + } + + fd = open(argv[optind], O_RDONLY); + if (fd < 0) { + perror("open"); + exit(2); + } + + tetra_gsmtap_init("localhost", 0); + while (1) { uint8_t buf[64]; int len; @@ -76,6 +87,7 @@ tetra_burst_sync_in(trs, buf, len); } + free(tms->dumpdir); talloc_free(trs); talloc_free(tms); diff --git a/src/tetra_common.h b/src/tetra_common.h index 3207c0d..d141e9b 100644 --- a/src/tetra_common.h +++ b/src/tetra_common.h @@ -47,7 +47,11 @@ struct { int is_traffic; } cur_burst; - struct tetra_si_decoded last_sid; + struct tetra_si_decoded last_sid; + + char *dumpdir; /* Where to save traffic channel dump */ + int ssi; /* SSI */ + int tsn; /* Timeslon number */ }; void tetra_mac_state_init(struct tetra_mac_state *tms); diff --git a/src/tetra_gsmtap.c b/src/tetra_gsmtap.c index f575c20..79b48a7 100644 --- a/src/tetra_gsmtap.c +++ b/src/tetra_gsmtap.c @@ -28,9 +28,9 @@ }; -struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan, - uint8_t ts, uint8_t ss, int8_t signal_dbm, - uint8_t snr, const ubit_t *bitdata, unsigned int bitlen) +struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan, uint8_t ts, uint8_t ss, + int8_t signal_dbm, uint8_t snr, const ubit_t *bitdata, unsigned int bitlen, + struct tetra_mac_state *tms) { struct msgb *msg; struct gsmtap_hdr *gh; @@ -47,6 +47,7 @@ gh->hdr_len = sizeof(*gh)/4; gh->type = GSMTAP_TYPE_TETRA_I1; gh->timeslot = ts; + tms->tsn = ts; gh->sub_slot = ss; gh->snr_db = snr; gh->signal_dbm = signal_dbm; diff --git a/src/tetra_gsmtap.h b/src/tetra_gsmtap.h index b62a4c5..34963d0 100644 --- a/src/tetra_gsmtap.h +++ b/src/tetra_gsmtap.h @@ -2,9 +2,9 @@ #define TETRA_GSMTAP_H #include "tetra_common.h" -struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan, - uint8_t ts, uint8_t ss, int8_t signal_dbm, - uint8_t snr, const uint8_t *data, unsigned int len); +struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan, uint8_t ts, uint8_t ss, + int8_t signal_dbm, uint8_t snr, const uint8_t *bitdata, unsigned int bitlen, + struct tetra_mac_state *tms); int tetra_gsmtap_sendmsg(struct msgb *msg); diff --git a/src/tetra_upper_mac.c b/src/tetra_upper_mac.c index fdc8c73..a4c7e59 100644 --- a/src/tetra_upper_mac.c +++ b/src/tetra_upper_mac.c @@ -181,6 +181,8 @@ rx_tm_sdu(tms, msg, len_bits); } + tms->ssi = rsd.addr.ssi; + out: printf("\n"); } @@ -241,7 +243,7 @@ /* save the state whether the current burst is traffic or not */ if (aad.dl_usage > 3) - tms->cur_burst.is_traffic = 1; + tms->cur_burst.is_traffic = aad.dl_usage; else tms->cur_burst.is_traffic = 0; @@ -276,7 +278,7 @@ gsmtap_msg = tetra_gsmtap_makemsg(&tup->tdma_time, tup->lchan, tup->tdma_time.tn, /* FIXME: */ 0, 0, 0, - msg->l1h, msgb_l1len(msg)); + msg->l1h, msgb_l1len(msg), tms); if (gsmtap_msg) tetra_gsmtap_sendmsg(gsmtap_msg); -- To view, visit https://gerrit.osmocom.org/10264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I94135753a76cadfa373167ffca18e89bee5bcff8 Gerrit-Change-Number: 10264 Gerrit-PatchSet: 2 Gerrit-Owner: Jan Hrach 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 Sep 28 23:29:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:29:01 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Abandoned we have now merged a change to osmo-msc to be compatible with nitb and osmo-sip-connector. -- 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: abandon 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 -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:30:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:30:23 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log file to appear in the artifacts. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11013 ) Change subject: ttcn3-sgsn-test: save the log file to appear in the artifacts. ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 28 Sep 2018 23:30: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 Sep 28 23:30:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:30:24 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-test: save the log file to appear in the artifacts. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11013 ) Change subject: ttcn3-sgsn-test: save the log file to appear in the artifacts. ...................................................................... ttcn3-sgsn-test: save the log file to appear in the artifacts. The sgsn does not save anywhere it's logfile. Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 --- M ttcn3-sgsn-test/osmo-sgsn.cfg 1 file changed, 38 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 20dea6e..72ca46d 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -40,6 +40,44 @@ logging level lm3ua notice logging level lmgcp notice ! +log file sgsn-raw.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level all everything + logging level mm debug + logging level pag notice + logging level meas notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp info + logging level llc debug + logging level sndcp debug + logging level slhc notice + logging level ranap info + logging level sua info + logging level v42bis info + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp debug + logging level lstats notice + logging level lgsup debug + logging level loap notice + logging level lss7 notice + logging level lsccp info + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! stats interval 5 ! line vty -- To view, visit https://gerrit.osmocom.org/11013 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: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9 Gerrit-Change-Number: 11013 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:30:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:30:33 +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_#5867?= In-Reply-To: <2081811297.381.1538176579917.JavaMail.jenkins@jenkins.osmocom.org> References: <2081811297.381.1538176579917.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1825346425.384.1538177433647.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL ------------------------------------------ [...truncated 43.58 KB...] CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns_frgre.lo CC gprs_ns_vty.lo CC gprs_ns.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC class_tables.lo CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make: *** [install] Error 2 Makefile:904: 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 Fri Sep 28 23:30:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:30:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5867?= In-Reply-To: <723786331.379.1538176574941.JavaMail.jenkins@jenkins.osmocom.org> References: <723786331.379.1538176574941.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <391179185.385.1538177436071.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL ------------------------------------------ [...truncated 42.83 KB...] CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_bssgp.lo CC gprs_ns_vty.lo CC gprs_ns_frgre.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --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 /build/deps/install/stow/libosmocore/lib 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib && { 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 /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_sim.lo CC card_fs_usim.lo CC card_fs_uicc.lo CC card_fs_isim.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmosim.la' libtool: install: (cd /build/deps/libosmocore/src/sim; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath /build/deps/install/stow/libosmocore/lib core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T /build/deps/install/stow/libosmocore/lib/libosmosim.so.0.0.2 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai /build/deps/install/stow/libosmocore/lib/libosmosim.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/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[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in utils make[2]: Entering directory '/build/deps/libosmocore/utils' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-auc-gen CCLD osmo-config-merge CCLD osmo-sim-test make[3]: Entering directory '/build/deps/libosmocore/utils' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge '/build/deps/install/stow/libosmocore/bin' libtool: install: /usr/bin/install -c .libs/osmo-arfcn /build/deps/install/stow/libosmocore/bin/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen /build/deps/install/stow/libosmocore/bin/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge /build/deps/install/stow/libosmocore/bin/osmo-config-merge make[3]: Leaving directory '/build/deps/libosmocore/utils' make[2]: Leaving directory '/build/deps/libosmocore/utils' Making install in tests make[2]: Entering directory '/build/deps/libosmocore/tests' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' 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/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' Making install in man make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed make[2]: Leaving directory '/build/deps/libosmocore/man' make[2]: *** [osmo-config-merge.8] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:605: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:904: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:43:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:43:25 +0000 Subject: Change in libosmocore[master]: Revert "osmo-config-merge: Add manual page" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11151 Change subject: Revert "osmo-config-merge: Add manual page" ...................................................................... Revert "osmo-config-merge: Add manual page" This reverts commit 6dd00d876e2b947e070f776f90fbb8305a237d21. Unfortunately, it seems older a2x versions don't support "-D" for manpage generation: All the osmocom master builds started to fail with: make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed Change-Id: I0f45362d3e978c328d962a5c0d883eade27b875c --- M .gitignore M Makefile.am M configure.ac D man/Makefile.am D man/osmo-config-merge.adoc 5 files changed, 1 insertion(+), 95 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/11151/1 diff --git a/.gitignore b/.gitignore index cb2ce68..451c883 100644 --- a/.gitignore +++ b/.gitignore @@ -81,7 +81,6 @@ doc/gb doc/html.tar doc/*.tag -man/*.8 tags src/crc*gen.c diff --git a/Makefile.am b/Makefile.am index 745d482..de5eb35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests man +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ diff --git a/configure.ac b/configure.ac index 529aad1..bc3358a 100644 --- a/configure.ac +++ b/configure.ac @@ -77,19 +77,6 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") -AC_ARG_ENABLE([man-doc], - [AS_HELP_STRING([--disable-man-doc], [Disable man page documentation])], - [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ]) - -AS_IF([test "x$BUILD_MAN" = "xyes"], [ - AC_CHECK_PROG(A2X, [a2x], [yes]) - AS_IF([test "$A2X" != "yes"], - [AC_MSG_ERROR([a2x not found, please install asciidoc or use the - option --disable-man-doc])]) -]) -AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes") -AC_SUBST(BUILD_MAN) - # check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include ]]) @@ -383,7 +370,6 @@ libosmoctrl.pc libosmosim.pc include/Makefile - man/Makefile src/Makefile src/vty/Makefile src/codec/Makefile diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index b287714..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -if BUILD_MAN -man_MANS = osmo-config-merge.8 -endif - -ASCIIDOCS = osmo-config-merge.adoc - -A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir} - -%.8 : %.adoc - a2x ${A2X_OPTS_MANPAGE} $< - -EXTRA_DIST = ${ASCIIDOCS} - -CLEANFILES = \ - osmo-config-merge.8 diff --git a/man/osmo-config-merge.adoc b/man/osmo-config-merge.adoc deleted file mode 100644 index 205fb50..0000000 --- a/man/osmo-config-merge.adoc +++ /dev/null @@ -1,64 +0,0 @@ -osmo-config-merge(8) -===================== - -NAME ----- -osmo-config-merge - Merge osmocom config snippets into an existing config - -SYNOPSIS --------- -[verse] -*osmo-config-merge* [--debug] - -DESCRIPTION ------------ -This utility allows you to merge an incremental config "patch" -into an osmocom-style config file. - -The patch file follows the same syntax as the original config file. - -It works by appending the leaf nodes of the patch file to the respective -nodes of the input config file. - -This process allows configuration file changes/updates to be performed -in a more stable/reliable way than by means of (unified) diff files, -as they break every time the context lines break. - -osmo-config-merge doesn't suffer from this problem, as it understands -the tree-like nature of VTY config files. - -The resulting config is printed to stdout. - -NOTE: This only works with configuration files that have proper -indenting, i.e. every level in the hierarchy must be indented excatly -one character, not multiple. - -OPTIONS -------- -*--debug*:: - Show debugging output when parsing the config tree. Needs to be the last argument. - -EXAMPLE USAGE -------------- -[verse] -$ osmo-config-merge osmo-msc.cfg.base osmo-msc_change_network.cfg > osmo-msc.cfg - -EXIT STATUS ------------ -Exit status is 0 if the command was successful, and 1 in case of a -wrong/missing argument. If the tool detects an error in the patch file the -exit status is 2. - -SEE ALSO --------- -The official Osmocom documentation including the VTY config refernce can be -found at: http://ftp.osmocom.org/docs/latest/ - -The Osmocom wiki is located at: http://projects.osmocom.org/ - - -AUTHORS -------- -osmo-config-merge was written by Harald Welte. - -The man page was written by Daniel Willmann. -- To view, visit https://gerrit.osmocom.org/11151 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: I0f45362d3e978c328d962a5c0d883eade27b875c Gerrit-Change-Number: 11151 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 28 23:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:44:24 +0000 Subject: Change in libosmocore[master]: Revert "osmo-config-merge: Add manual page" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11151 ) Change subject: Revert "osmo-config-merge: Add manual page" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 I'm sorry we have to revert the manpage commit as it unfortunately breaks all master builds now :( -- To view, visit https://gerrit.osmocom.org/11151 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: I0f45362d3e978c328d962a5c0d883eade27b875c Gerrit-Change-Number: 11151 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 28 Sep 2018 23:44: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 Sep 28 23:44:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Sep 2018 23:44:25 +0000 Subject: Change in libosmocore[master]: Revert "osmo-config-merge: Add manual page" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11151 ) Change subject: Revert "osmo-config-merge: Add manual page" ...................................................................... Revert "osmo-config-merge: Add manual page" This reverts commit 6dd00d876e2b947e070f776f90fbb8305a237d21. Unfortunately, it seems older a2x versions don't support "-D" for manpage generation: All the osmocom master builds started to fail with: make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed Change-Id: I0f45362d3e978c328d962a5c0d883eade27b875c --- M .gitignore M Makefile.am M configure.ac D man/Makefile.am D man/osmo-config-merge.adoc 5 files changed, 1 insertion(+), 95 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/.gitignore b/.gitignore index cb2ce68..451c883 100644 --- a/.gitignore +++ b/.gitignore @@ -81,7 +81,6 @@ doc/gb doc/html.tar doc/*.tag -man/*.8 tags src/crc*gen.c diff --git a/Makefile.am b/Makefile.am index 745d482..de5eb35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests man +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ diff --git a/configure.ac b/configure.ac index 529aad1..bc3358a 100644 --- a/configure.ac +++ b/configure.ac @@ -77,19 +77,6 @@ AC_PATH_PROG(DOXYGEN,doxygen,false) AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes") -AC_ARG_ENABLE([man-doc], - [AS_HELP_STRING([--disable-man-doc], [Disable man page documentation])], - [ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ]) - -AS_IF([test "x$BUILD_MAN" = "xyes"], [ - AC_CHECK_PROG(A2X, [a2x], [yes]) - AS_IF([test "$A2X" != "yes"], - [AC_MSG_ERROR([a2x not found, please install asciidoc or use the - option --disable-man-doc])]) -]) -AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes") -AC_SUBST(BUILD_MAN) - # check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include ]]) @@ -383,7 +370,6 @@ libosmoctrl.pc libosmosim.pc include/Makefile - man/Makefile src/Makefile src/vty/Makefile src/codec/Makefile diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index b287714..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -if BUILD_MAN -man_MANS = osmo-config-merge.8 -endif - -ASCIIDOCS = osmo-config-merge.adoc - -A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir} - -%.8 : %.adoc - a2x ${A2X_OPTS_MANPAGE} $< - -EXTRA_DIST = ${ASCIIDOCS} - -CLEANFILES = \ - osmo-config-merge.8 diff --git a/man/osmo-config-merge.adoc b/man/osmo-config-merge.adoc deleted file mode 100644 index 205fb50..0000000 --- a/man/osmo-config-merge.adoc +++ /dev/null @@ -1,64 +0,0 @@ -osmo-config-merge(8) -===================== - -NAME ----- -osmo-config-merge - Merge osmocom config snippets into an existing config - -SYNOPSIS --------- -[verse] -*osmo-config-merge* [--debug] - -DESCRIPTION ------------ -This utility allows you to merge an incremental config "patch" -into an osmocom-style config file. - -The patch file follows the same syntax as the original config file. - -It works by appending the leaf nodes of the patch file to the respective -nodes of the input config file. - -This process allows configuration file changes/updates to be performed -in a more stable/reliable way than by means of (unified) diff files, -as they break every time the context lines break. - -osmo-config-merge doesn't suffer from this problem, as it understands -the tree-like nature of VTY config files. - -The resulting config is printed to stdout. - -NOTE: This only works with configuration files that have proper -indenting, i.e. every level in the hierarchy must be indented excatly -one character, not multiple. - -OPTIONS -------- -*--debug*:: - Show debugging output when parsing the config tree. Needs to be the last argument. - -EXAMPLE USAGE -------------- -[verse] -$ osmo-config-merge osmo-msc.cfg.base osmo-msc_change_network.cfg > osmo-msc.cfg - -EXIT STATUS ------------ -Exit status is 0 if the command was successful, and 1 in case of a -wrong/missing argument. If the tool detects an error in the patch file the -exit status is 2. - -SEE ALSO --------- -The official Osmocom documentation including the VTY config refernce can be -found at: http://ftp.osmocom.org/docs/latest/ - -The Osmocom wiki is located at: http://projects.osmocom.org/ - - -AUTHORS -------- -osmo-config-merge was written by Harald Welte. - -The man page was written by Daniel Willmann. -- To view, visit https://gerrit.osmocom.org/11151 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: I0f45362d3e978c328d962a5c0d883eade27b875c Gerrit-Change-Number: 11151 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Sep 28 23:53:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:53:47 +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_#1535?= In-Reply-To: <810908088.368.1538176053894.JavaMail.jenkins@jenkins.osmocom.org> References: <810908088.368.1538176053894.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <933312699.386.1538178827799.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Sep 28 23:53:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:53:53 +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_#1535?= In-Reply-To: <541233564.369.1538176064318.JavaMail.jenkins@jenkins.osmocom.org> References: <541233564.369.1538176064318.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <224413403.387.1538178833041.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Sep 28 23:54:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:54:30 +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_#5868?= In-Reply-To: <391179185.385.1538177436071.JavaMail.jenkins@jenkins.osmocom.org> References: <391179185.385.1538177436071.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1164991614.388.1538178870932.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Sep 28 23:55:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:55:34 +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_#5868?= In-Reply-To: <1825346425.384.1538177433647.JavaMail.jenkins@jenkins.osmocom.org> References: <1825346425.384.1538177433647.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <882072983.389.1538178934934.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Sep 28 23:58:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:58:37 +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_#6015?= In-Reply-To: <1249921742.382.1538176580588.JavaMail.jenkins@jenkins.osmocom.org> References: <1249921742.382.1538176580588.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1812225061.390.1538179117575.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Sep 28 23:59:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:59:17 +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_#3635?= In-Reply-To: <2136917915.383.1538177010078.JavaMail.jenkins@jenkins.osmocom.org> References: <2136917915.383.1538177010078.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <760095485.391.1538179157562.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Sep 28 23:59:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Sep 2018 23:59:21 +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_#6015?= In-Reply-To: <784920075.380.1538176575292.JavaMail.jenkins@jenkins.osmocom.org> References: <784920075.380.1538176575292.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1500107011.392.1538179161234.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sat Sep 29 00:03:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 29 Sep 2018 00:03:27 +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_#2860?= In-Reply-To: <1018227262.378.1538176188879.JavaMail.jenkins@jenkins.osmocom.org> References: <1018227262.378.1538176188879.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <70956226.393.1538179407363.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sat Sep 29 00:04:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 29 Sep 2018 00:04:06 +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_#2860?= In-Reply-To: <914645665.377.1538176178881.JavaMail.jenkins@jenkins.osmocom.org> References: <914645665.377.1538176178881.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1119155974.394.1538179446733.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Sep 29 01:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 29 Sep 2018 01:22:37 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Fix missing Security Command for 3G when attaching In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11150 ) Change subject: gprs_gmm: Fix missing Security Command for 3G when attaching ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11150 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: I1e12b0a32e58c6f78dba7b548f7d7016567229db Gerrit-Change-Number: 11150 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 29 Sep 2018 01: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 Sat Sep 29 06:19:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 06:19:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix Measurement Reporting on SACCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11138 ) Change subject: trxcon/scheduler: fix Measurement Reporting on SACCH ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c File src/host/trxcon/sched_prim.c: https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c at 182 PS4, Line 182: * FIXME: this would require having access to the trx_instance, > Let's do it later in a separate change. According to the specs (3GPP TS 05.08) the maintenance of both timing advance and MS power control should be done separately per each pair of DCCH/TCH and SACCH. This means it would be good to store both TA and PWR in the corresponding lchans instead of storing in a single common trx_instance... https://gerrit.osmocom.org/#/c/11138/4/src/host/trxcon/sched_prim.c at 255 PS4, Line 255: llist_for_each_entry(prim, queue, list) { > I think it would be more elegant to have a second queue for SACCH so we don't have to scan the (shar [?] It could be done this way, but we would still have the need to look for the relevant messages within this SACCH queue. Why? Because a SACCH channel accomplishes either a DCCH, or a TCH channel, so if one would have a few independent connections (DCCH and/or TCH), e.g. for testing, then it is important to distinguish between multiple SACCH channels. -- To view, visit https://gerrit.osmocom.org/11138 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: If1b8dc74ced746d6270676fdde75fcda32f91a3d Gerrit-Change-Number: 11138 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 29 Sep 2018 06:19:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 29 14:55:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 14:55:30 +0000 Subject: Change in mncc-python[master]: *.py: use proper '#!/usr/bin/env' shebang Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11152 Change subject: *.py: use proper '#!/usr/bin/env' shebang ...................................................................... *.py: use proper '#!/usr/bin/env' shebang Using hard-coded paths in shebang is a bad idea, because on different systems Python interpreter can be installed in different places. See: https://mail.python.org/pipermail/tutor/2007-June/054816.html Change-Id: Ib729ece0c95254dc2b235f90eb731681df955bd1 --- M gsm_call_fsm.py M mncc_sock.py M mncc_test.py M smpp_test.py 4 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/52/11152/1 diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py index 167a805..c62df0c 100644 --- a/gsm_call_fsm.py +++ b/gsm_call_fsm.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Python implementation of GSM 04.08 call state machine for use with # OsmoNITB MNCC interface diff --git a/mncc_sock.py b/mncc_sock.py index 3cc1ba1..22fe034 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Python interface to OsmoNITB MNCC (Mobile Network Call Control) # interface diff --git a/mncc_test.py b/mncc_test.py index f9d102b..de35fe6 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Python testing tool for establishing calls via the OsmoNITB MNCC # interface. diff --git a/smpp_test.py b/smpp_test.py index e2c2ee0..181f60d 100755 --- a/smpp_test.py +++ b/smpp_test.py @@ -1,4 +1,5 @@ -#!/usr/bin/python +#!/usr/bin/env python2 + import logging import sys -- To view, visit https://gerrit.osmocom.org/11152 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: Ib729ece0c95254dc2b235f90eb731681df955bd1 Gerrit-Change-Number: 11152 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 29 14:55:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 14:55:30 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: parse and match MNCC_SOCKET_HELLO message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11153 Change subject: mncc_sock.py: parse and match MNCC_SOCKET_HELLO message ...................................................................... mncc_sock.py: parse and match MNCC_SOCKET_HELLO message Change-Id: If6c3ca37a83db1d4ae75796f7be687601b159136 --- M mncc_sock.py 1 file changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/53/11153/1 diff --git a/mncc_sock.py b/mncc_sock.py index 22fe034..34ab361 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -4,6 +4,7 @@ # interface # # (C) 2015 by Harald Welte +# (C) 2018 by Vadim Yanitskiy # # Licensed under GNU General Public License, Version 2 or at your # option, any later version. @@ -25,6 +26,17 @@ def __unicode__(self): return u'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) +class mncc_hello_msg(mncc.gsm_mncc_hello): + def send(self): + return buffer(self)[:] + def receive(self, bytes): + fit = min(len(bytes), ctypes.sizeof(self)) + ctypes.memmove(ctypes.addressof(self), bytes, fit) + def __str__(self): + return 'mncc_hello_msg(version=0x%04x)' % (self.version) + def __unicode__(self): + return u'mncc_hello_msg(version=0x%04x)' % (self.version) + class mncc_rtp_msg(mncc.gsm_mncc_rtp): def send(self): return buffer(self)[:] @@ -79,6 +91,9 @@ if ms.msg_type == mncc.MNCC_RTP_CREATE or ms.msg_type == mncc.MNCC_RTP_CONNECT or ms.msg_type == mncc.MNCC_RTP_FREE: ms = mncc_rtp_msg() ms.receive(data) + elif ms.msg_type == mncc.MNCC_SOCKET_HELLO: + ms = mncc_hello_msg() + ms.receive(data) return ms class MnccSocket(MnccSocketBase): @@ -92,9 +107,37 @@ sys.stderr.write("%s\n" % errmsg) sys.exit(1) - # FIXME: parse the HELLO message + # Check the HELLO message + self.check_hello() + + def check_hello(self): + print('Waiting for HELLO message...') msg = self.recv() + # Match expected message type + if msg.msg_type != mncc.MNCC_SOCKET_HELLO: + sys.stderr.write('Received an unknown (!= MNCC_SOCKET_HELLO) ' + 'message: %s\n' % msg) + sys.exit(1) + + # Match expected protocol version + if msg.version != mncc.MNCC_SOCK_VERSION: + sys.stderr.write('MNCC protocol version mismatch ' + '(0x%04x vs 0x%04x)\n' % (msg.version, mncc.MNCC_SOCK_VERSION)) + sys.exit(1) + + # Match expected message sizes / offsets + if (msg.mncc_size != ctypes.sizeof(mncc.gsm_mncc) or + msg.data_frame_size != ctypes.sizeof(mncc.gsm_data_frame) or + msg.called_offset != mncc.gsm_mncc.called.offset or + msg.signal_offset != mncc.gsm_mncc.signal.offset or + msg.emergency_offset != mncc.gsm_mncc.emergency.offset or + msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): + sys.stderr.write('MNCC message alignment mismatch\n') + sys.exit(1) + + print('Received %s' % msg) + class MnccSocketServer(object): def __init__(self, address = '/tmp/bsc_mncc'): os.unlink(address) -- To view, visit https://gerrit.osmocom.org/11153 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: If6c3ca37a83db1d4ae75796f7be687601b159136 Gerrit-Change-Number: 11153 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 29 14:55:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 14:55:30 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: share common send() / receive() calls Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11154 Change subject: mncc_sock.py: share common send() / receive() calls ...................................................................... mncc_sock.py: share common send() / receive() calls Change-Id: I871c72c8e3392a1be76e0126a24b3bc9a787113d --- M mncc_sock.py 1 file changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/54/11154/1 diff --git a/mncc_sock.py b/mncc_sock.py index 34ab361..9887471 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -15,45 +15,32 @@ import mncc import ctypes -class mncc_msg(mncc.gsm_mncc): +class mncc_msg_common: def send(self): return buffer(self)[:] def receive(self, bytes): fit = min(len(bytes), ctypes.sizeof(self)) ctypes.memmove(ctypes.addressof(self), bytes, fit) + +class mncc_msg(mncc.gsm_mncc, mncc_msg_common): def __str__(self): return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) def __unicode__(self): return u'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) -class mncc_hello_msg(mncc.gsm_mncc_hello): - def send(self): - return buffer(self)[:] - def receive(self, bytes): - fit = min(len(bytes), ctypes.sizeof(self)) - ctypes.memmove(ctypes.addressof(self), bytes, fit) +class mncc_hello_msg(mncc.gsm_mncc_hello, mncc_msg_common): def __str__(self): return 'mncc_hello_msg(version=0x%04x)' % (self.version) def __unicode__(self): return u'mncc_hello_msg(version=0x%04x)' % (self.version) -class mncc_rtp_msg(mncc.gsm_mncc_rtp): - def send(self): - return buffer(self)[:] - def receive(self, bytes): - fit = min(len(bytes), ctypes.sizeof(self)) - ctypes.memmove(ctypes.addressof(self), bytes, fit) +class mncc_rtp_msg(mncc.gsm_mncc_rtp, mncc_msg_common): def __str__(self): return 'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) def __unicode__(self): return u'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) -class mncc_bridge_msg(mncc.gsm_mncc_bridge): - def send(self): - return buffer(self)[:] - def receive(self, bytes): - fit = min(len(bytes), ctypes.sizeof(self)) - ctypes.memmove(ctypes.addressof(self), bytes, fit) +class mncc_bridge_msg(mncc.gsm_mncc_bridge, mncc_msg_common): def __str__(self): return 'mncc_bridge_msg(%u, %u)' % (self.callref[0], self.callref[1]) def __unicode__(self): -- To view, visit https://gerrit.osmocom.org/11154 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: I871c72c8e3392a1be76e0126a24b3bc9a787113d Gerrit-Change-Number: 11154 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Sep 29 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 29 Sep 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_#261?= In-Reply-To: <1719487855.360.1538147407134.JavaMail.jenkins@jenkins.osmocom.org> References: <1719487855.360.1538147407134.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1207893089.406.1538233806998.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 flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l 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 %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.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_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 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 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_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 -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_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_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_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_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_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_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 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 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_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_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 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 -o asn1p_class.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 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_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 Sat Sep 29 15:34:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 15:34:07 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: simplify msg_type matching Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11155 Change subject: mncc_sock.py: simplify msg_type matching ...................................................................... mncc_sock.py: simplify msg_type matching Change-Id: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d --- M mncc_sock.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/55/11155/1 diff --git a/mncc_sock.py b/mncc_sock.py index 9887471..1c4f6be 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -22,6 +22,11 @@ fit = min(len(bytes), ctypes.sizeof(self)) ctypes.memmove(ctypes.addressof(self), bytes, fit) + # Message type matching + def is_rtp(self): + return self.msg_type in (mncc.MNCC_RTP_CREATE, + mncc.MNCC_RTP_CONNECT, mncc.MNCC_RTP_FREE) + class mncc_msg(mncc.gsm_mncc, mncc_msg_common): def __str__(self): return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) @@ -75,7 +80,7 @@ data = self.sock.recv(1500) ms = mncc_msg() ms.receive(data) - if ms.msg_type == mncc.MNCC_RTP_CREATE or ms.msg_type == mncc.MNCC_RTP_CONNECT or ms.msg_type == mncc.MNCC_RTP_FREE: + if ms.is_rtp(): ms = mncc_rtp_msg() ms.receive(data) elif ms.msg_type == mncc.MNCC_SOCKET_HELLO: -- To view, visit https://gerrit.osmocom.org/11155 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: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d Gerrit-Change-Number: 11155 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 29 15:34:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 15:34:08 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: distinguish traffic frames Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11156 Change subject: mncc_sock.py: distinguish traffic frames ...................................................................... mncc_sock.py: distinguish traffic frames Change-Id: I996513e433bb57f12a4030391697f4e87e6ff938 --- M mncc_sock.py M mncc_test.py 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/56/11156/1 diff --git a/mncc_sock.py b/mncc_sock.py index 1c4f6be..e71a39a 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -26,6 +26,10 @@ def is_rtp(self): return self.msg_type in (mncc.MNCC_RTP_CREATE, mncc.MNCC_RTP_CONNECT, mncc.MNCC_RTP_FREE) + def is_frame(self): + return self.msg_type in (mncc.GSM_TCHF_FRAME, + mncc.GSM_TCHH_FRAME, mncc.GSM_TCHF_FRAME_EFR, + mncc.GSM_TCH_FRAME_AMR, mncc.GSM_BAD_FRAME) class mncc_msg(mncc.gsm_mncc, mncc_msg_common): def __str__(self): @@ -39,6 +43,28 @@ def __unicode__(self): return u'mncc_hello_msg(version=0x%04x)' % (self.version) +class mncc_data_frame_msg(mncc.gsm_data_frame, mncc_msg_common): + def __str__(self): + return 'mncc_data_frame(type=0x%04x, codec=%s, callref=%u)' \ + % (self.msg_type, self.codec_str(), self.callref) + def __unicode__(self): + return u'mncc_data_frame(type=0x%04x, codec=%s, callref=%u)' \ + % (self.msg_type, self.codec_str(), self.callref) + + def codec_str(self): + if self.msg_type == mncc.GSM_TCHF_FRAME: + return "FR" + elif self.msg_type == mncc.GSM_TCHH_FRAME: + return "HR" + elif self.msg_type == mncc.GSM_TCHF_FRAME_EFR: + return "EFR" + elif self.msg_type == mncc.GSM_TCH_FRAME_AMR: + return "AMR" + elif self.msg_type == mncc.GSM_BAD_FRAME: + return "(BFI)" + else: + return "(???)" + class mncc_rtp_msg(mncc.gsm_mncc_rtp, mncc_msg_common): def __str__(self): return 'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) @@ -83,6 +109,9 @@ if ms.is_rtp(): ms = mncc_rtp_msg() ms.receive(data) + elif ms.is_frame(): + ms = mncc_data_frame_msg() + ms.receive(data) elif ms.msg_type == mncc.MNCC_SOCKET_HELLO: ms = mncc_hello_msg() ms.receive(data) diff --git a/mncc_test.py b/mncc_test.py index de35fe6..df66efb 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -35,6 +35,10 @@ def mncc_rx_thread(mncc_sock): while 1: msg = mncc_sock.recv() + if msg.is_frame(): + print("Dropping traffic frame: %s" % msg) + continue + print "MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg # we simply broadcast to all calls pykka.ActorRegistry.broadcast({'type': 'mncc', 'msg': msg}, GsmCallFsm) -- To view, visit https://gerrit.osmocom.org/11156 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: I996513e433bb57f12a4030391697f4e87e6ff938 Gerrit-Change-Number: 11156 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 29 16:30:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Sep 2018 16:30:48 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: prevent division by zero Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11157 Change subject: trxcon/scheduler: fix: prevent division by zero ...................................................................... trxcon/scheduler: fix: prevent division by zero Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 --- M src/host/trxcon/sched_lchan_common.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/11157/1 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 95e496b..62ec0f7 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -96,8 +96,9 @@ dl_hdr.link_id = lchan_desc->link_id; dl_hdr.band_arfcn = htons(trx->band_arfcn); dl_hdr.frame_nr = htonl(lchan->rx_first_fn); - dl_hdr.rx_level = -(lchan->meas.rssi_sum / lchan->meas.rssi_num); dl_hdr.num_biterr = bit_error_count; + dl_hdr.rx_level = lchan->meas.rssi_num ? + -(lchan->meas.rssi_sum / lchan->meas.rssi_num) : 0; /* FIXME: set proper values */ dl_hdr.snr = 0; -- To view, visit https://gerrit.osmocom.org/11157 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: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 29 19:57:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 29 Sep 2018 19:57:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5bafd9233fe7e_21059b26842762a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 155s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 155s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 155s] collect2: error: ld returned 1 exit status [ 155s] Makefile:473: recipe for target 'InterthreadTest' failed [ 155s] make[4]: *** [InterthreadTest] Error 1 [ 155s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 155s] Makefile:400: recipe for target 'all-recursive' failed [ 155s] make[3]: *** [all-recursive] Error 1 [ 155s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 155s] Makefile:515: recipe for target 'all-recursive' failed [ 155s] make[2]: *** [all-recursive] Error 1 [ 155s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 155s] Makefile:446: 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:6: recipe for target 'build' failed [ 155s] make: *** [build] Error 2 [ 155s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 155s] [ 155s] lamb07 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:57:05 UTC 2018. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 147.542328] sysrq: SysRq : Power Off [ 158s] [ 147.549807] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb07 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:57:08 UTC 2018. [ 158s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 29 19:56:58 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 29 Sep 2018 19:56:58 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5bafd92275f8c_21059b2684276170@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 165s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 165s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 165s] collect2: error: ld returned 1 exit status [ 165s] Makefile:473: recipe for target 'InterthreadTest' failed [ 165s] make[4]: *** [InterthreadTest] Error 1 [ 165s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 165s] Makefile:400: recipe for target 'all-recursive' failed [ 165s] make[3]: *** [all-recursive] Error 1 [ 165s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 165s] Makefile:515: recipe for target 'all-recursive' failed [ 165s] make[2]: *** [all-recursive] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 165s] Makefile:446: recipe for target 'all' failed [ 165s] make[1]: *** [all] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: make -j1 returned exit code 2 [ 165s] debian/rules:6: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] [ 165s] lamb64 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:56:38 UTC 2018. [ 165s] [ 165s] ### VM INTERACTION START ### [ 168s] [ 158.053672] sysrq: SysRq : Power Off [ 168s] [ 158.061657] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb64 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:56:41 UTC 2018. [ 168s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 29 19:58:24 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 29 Sep 2018 19:58:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5bafd97e5c78e_21059b2684276388@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 145s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 145s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 145s] collect2: error: ld returned 1 exit status [ 145s] Makefile:473: recipe for target 'InterthreadTest' failed [ 145s] make[4]: *** [InterthreadTest] Error 1 [ 145s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 145s] Makefile:400: recipe for target 'all-recursive' failed [ 145s] make[3]: *** [all-recursive] Error 1 [ 145s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 145s] Makefile:515: recipe for target 'all-recursive' failed [ 145s] make[2]: *** [all-recursive] Error 1 [ 145s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 145s] Makefile:446: recipe for target 'all' failed [ 145s] make[1]: *** [all] Error 2 [ 145s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 145s] dh_auto_build: make -j1 returned exit code 2 [ 145s] debian/rules:6: recipe for target 'build' failed [ 145s] make: *** [build] Error 2 [ 145s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 145s] [ 145s] sheep84 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:58:16 UTC 2018. [ 145s] [ 145s] ### VM INTERACTION START ### [ 148s] [ 140.444273] sysrq: SysRq : Power Off [ 148s] [ 140.449958] reboot: Power down [ 148s] ### VM INTERACTION END ### [ 148s] [ 148s] sheep84 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:58:19 UTC 2018. [ 148s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 29 19:58:24 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 29 Sep 2018 19:58:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5bafd97eadca2_21059b26842764e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 221s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 221s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 221s] collect2: error: ld returned 1 exit status [ 221s] Makefile:473: recipe for target 'InterthreadTest' failed [ 221s] make[4]: *** [InterthreadTest] Error 1 [ 221s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 221s] Makefile:400: recipe for target 'all-recursive' failed [ 221s] make[3]: *** [all-recursive] Error 1 [ 221s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 221s] Makefile:515: recipe for target 'all-recursive' failed [ 221s] make[2]: *** [all-recursive] Error 1 [ 221s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 221s] Makefile:446: recipe for target 'all' failed [ 221s] make[1]: *** [all] Error 2 [ 221s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 221s] dh_auto_build: make -j1 returned exit code 2 [ 221s] debian/rules:6: recipe for target 'build' failed [ 221s] make: *** [build] Error 2 [ 221s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 221s] [ 221s] cloud108 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:58:16 UTC 2018. [ 221s] [ 221s] ### VM INTERACTION START ### [ 224s] [ 202.129247] sysrq: SysRq : Power Off [ 224s] [ 202.134404] reboot: Power down [ 225s] ### VM INTERACTION END ### [ 225s] [ 225s] cloud108 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:58:21 UTC 2018. [ 225s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 29 19:59:32 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 29 Sep 2018 19:59:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5bafd9b7d4b4f_21059b2684276640@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 209s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 209s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 209s] collect2: error: ld returned 1 exit status [ 209s] Makefile:473: recipe for target 'InterthreadTest' failed [ 209s] make[4]: *** [InterthreadTest] Error 1 [ 209s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 209s] Makefile:400: recipe for target 'all-recursive' failed [ 209s] make[3]: *** [all-recursive] Error 1 [ 209s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 209s] Makefile:515: recipe for target 'all-recursive' failed [ 209s] make[2]: *** [all-recursive] Error 1 [ 209s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 209s] Makefile:446: recipe for target 'all' failed [ 209s] make[1]: *** [all] Error 2 [ 209s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 209s] dh_auto_build: make -j1 returned exit code 2 [ 209s] debian/rules:6: recipe for target 'build' failed [ 209s] make: *** [build] Error 2 [ 209s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 209s] [ 209s] lamb14 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:59:21 UTC 2018. [ 209s] [ 209s] ### VM INTERACTION START ### [ 213s] [ 200.018179] sysrq: SysRq : Power Off [ 213s] [ 200.026139] reboot: Power down [ 213s] ### VM INTERACTION END ### [ 213s] [ 213s] lamb14 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 19:59:25 UTC 2018. [ 213s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 29 20:00:24 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 29 Sep 2018 20:00:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5bafd9f62072f_21059b2684276760@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 241s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 241s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 241s] collect2: error: ld returned 1 exit status [ 242s] Makefile:473: recipe for target 'InterthreadTest' failed [ 242s] make[4]: *** [InterthreadTest] Error 1 [ 242s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 242s] Makefile:400: recipe for target 'all-recursive' failed [ 242s] make[3]: *** [all-recursive] Error 1 [ 242s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 242s] Makefile:515: recipe for target 'all-recursive' failed [ 242s] make[2]: *** [all-recursive] Error 1 [ 242s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 242s] Makefile:446: recipe for target 'all' failed [ 242s] make[1]: *** [all] Error 2 [ 242s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 242s] dh_auto_build: make -j1 returned exit code 2 [ 242s] debian/rules:6: recipe for target 'build' failed [ 242s] make: *** [build] Error 2 [ 242s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 242s] [ 242s] cloud108 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 20:00:07 UTC 2018. [ 242s] [ 242s] ### VM INTERACTION START ### [ 245s] [ 221.968195] sysrq: SysRq : Power Off [ 245s] [ 221.973191] reboot: Power down [ 246s] ### VM INTERACTION END ### [ 246s] [ 246s] cloud108 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sat Sep 29 20:00:12 UTC 2018. [ 246s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sun Sep 30 00:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 30 Sep 2018 00:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5891?= Message-ID: <180333792.410.1538266206821.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sgsn" build number 5891 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1559 originally caused by: Started by upstream project "master-libosmo-netif" build number 1126 originally caused by: Started by upstream project "master-libosmo-abis" build number 768 originally caused by: Started by upstream project "master-libosmocore" build number 503 originally caused by: Started by timer Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sgsn > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-sgsn +refs/heads/*:refs/remotes/origin/* Checking out Revision 47cf6bd001899680a0e0d1a4f920d2a37c19ec1e (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 47cf6bd001899680a0e0d1a4f920d2a37c19ec1e Commit message: "gprs_gmm: dont answer unknown IMSI/TMSI on Service Requests NET_FAIL" > git rev-list --no-walk 47cf6bd001899680a0e0d1a4f920d2a37c19ec1e # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins2229795947939817651.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--disable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin osmocom:amd64 /build/contrib/jenkins.sh + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf Skipping repository deps/libosmocore Skipping repository deps/libosmo-netif Skipping repository deps/osmo-ggsn Skipping repository deps/libosmo-abis + [ -d /build/deps ] + git_clean /build/deps/libosmo-abis + repos=/build/deps/libosmo-abis + [ ! -d /build/deps/libosmo-abis ] + [ ! -d /build/deps/libosmo-abis/.git ] + git -C /build/deps/libosmo-abis checkout -f HEAD + git -C /build/deps/libosmo-abis clean -dxf + git_clean /build/deps/libosmo-netif + repos=/build/deps/libosmo-netif + [ ! -d /build/deps/libosmo-netif ] + [ ! -d /build/deps/libosmo-netif/.git ] + git -C /build/deps/libosmo-netif checkout -f HEAD + git -C /build/deps/libosmo-netif clean -dxf + git_clean /build/deps/libosmocore + repos=/build/deps/libosmocore + [ ! -d /build/deps/libosmocore ] + [ ! -d /build/deps/libosmocore/.git ] + git -C /build/deps/libosmocore checkout -f HEAD + git -C /build/deps/libosmocore clean -dxf + git_clean /build/deps/osmo-ggsn + repos=/build/deps/osmo-ggsn + [ ! -d /build/deps/osmo-ggsn ] + [ ! -d /build/deps/osmo-ggsn/.git ] + git -C /build/deps/osmo-ggsn checkout -f HEAD + git -C /build/deps/osmo-ggsn clean -dxf + [ -d layer1-headers ] + mkdir /build/deps mkdir: cannot create directory '/build/deps': File exists + true + osmo-build-dep.sh libosmocore '' ac_cv_path_DOXYGEN=false =============================== libosmocore =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmocore + project=libosmocore + branch=master + + grep -c remotes/origin/master$ git branch -a + [ x1 != x0 ] + branch=origin/master + test -d libosmocore + cd libosmocore + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at 40f3521... Revert "osmo-config-merge: Add manual page" + git rev-parse HEAD 40f35212c71e8926b0dfe7463af959f00c56cd82 + cd libosmocore + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. 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' configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix=/build/deps/install/stow/libosmocore --with-systemdsystemunitdir=/build/deps/install/stow/libosmocore/lib/systemd/system ac_cv_path_DOXYGEN=false configure: WARNING: unrecognized options: --with-systemdsystemunitdir 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... no configure: error: in `/build/deps/libosmocore': configure: error: C compiler cannot create executables See `config.log' for more details Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Sep 30 00:18:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 30 Sep 2018 00:18:52 +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_#5892?= In-Reply-To: <180333792.410.1538266206821.JavaMail.jenkins@jenkins.osmocom.org> References: <180333792.410.1538266206821.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2066097206.411.1538266732732.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Sep 30 10:22:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 30 Sep 2018 10:22:11 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: throw / raise exceptions from MnccSocket Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11158 Change subject: mncc_sock.py: throw / raise exceptions from MnccSocket ...................................................................... mncc_sock.py: throw / raise exceptions from MnccSocket Calling sys.exit() from MnccSocket's constructor could lead to a situation when the main thread becomes "dead", while its child threads are still working. Let's throw the exceptions towards the caller, so it would be possible to handle them there. Change-Id: I485eb86c69e74693eeae89723de27e376585f1da --- M mncc_sock.py 1 file changed, 4 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/58/11158/1 diff --git a/mncc_sock.py b/mncc_sock.py index e71a39a..0a64a81 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -10,7 +10,6 @@ # option, any later version. import socket -import sys import os import mncc import ctypes @@ -122,11 +121,7 @@ super(MnccSocketBase, self).__init__() self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) print('connecting to %s' % address) - try: - self.sock.connect(address) - except socket.error as errmsg: - sys.stderr.write("%s\n" % errmsg) - sys.exit(1) + self.sock.connect(address) # Check the HELLO message self.check_hello() @@ -137,15 +132,13 @@ # Match expected message type if msg.msg_type != mncc.MNCC_SOCKET_HELLO: - sys.stderr.write('Received an unknown (!= MNCC_SOCKET_HELLO) ' + raise AssertionError('Received an unknown (!= MNCC_SOCKET_HELLO) ' 'message: %s\n' % msg) - sys.exit(1) # Match expected protocol version if msg.version != mncc.MNCC_SOCK_VERSION: - sys.stderr.write('MNCC protocol version mismatch ' + raise AssertionError('MNCC protocol version mismatch ' '(0x%04x vs 0x%04x)\n' % (msg.version, mncc.MNCC_SOCK_VERSION)) - sys.exit(1) # Match expected message sizes / offsets if (msg.mncc_size != ctypes.sizeof(mncc.gsm_mncc) or @@ -154,8 +147,7 @@ msg.signal_offset != mncc.gsm_mncc.signal.offset or msg.emergency_offset != mncc.gsm_mncc.emergency.offset or msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): - sys.stderr.write('MNCC message alignment mismatch\n') - sys.exit(1) + raise AssertionError('MNCC message alignment mismatch\n') print('Received %s' % msg) -- To view, visit https://gerrit.osmocom.org/11158 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: I485eb86c69e74693eeae89723de27e376585f1da Gerrit-Change-Number: 11158 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 10:22:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 30 Sep 2018 10:22:11 +0000 Subject: Change in mncc-python[master]: *.py: cosmetic: tweak the global logging format Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11159 Change subject: *.py: cosmetic: tweak the global logging format ...................................................................... *.py: cosmetic: tweak the global logging format Printing log level, file name, and line number together with a log message is the common practice in Osmocom projects that facilitates debugging and development. Change-Id: I80cd7cdfa41ae7e70a1890d88c8b2f7357a500af --- M contrib/manual_test_server.py M mncc_test.py M smpp_test.py 3 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/59/11159/1 diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py index 5625670..d92eb84 100644 --- a/contrib/manual_test_server.py +++ b/contrib/manual_test_server.py @@ -3,6 +3,8 @@ import ctypes import socket +import logging as log + GSM340_PLAN_ISDN = 1 GSM340_TYPE_NATIONAL = 2 @@ -80,6 +82,9 @@ conn.send_msg(MnccMessageBuilder.build_dtmf_stop(callref, '2')) +log.basicConfig(level = log.DEBUG, + format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") + server = mncc_sock.MnccSocketServer() conn = server.accept() diff --git a/mncc_test.py b/mncc_test.py index df66efb..9222605 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -48,7 +48,8 @@ pykka.ActorRegistry.stop_all() sys.exit(0) -logging.basicConfig(level=logging.DEBUG) +logging.basicConfig(level = logging.DEBUG, + format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") signal.signal(signal.SIGINT, sigint_handler) diff --git a/smpp_test.py b/smpp_test.py index 181f60d..ad7d4dc 100755 --- a/smpp_test.py +++ b/smpp_test.py @@ -11,7 +11,8 @@ # to generate some SMS load on OsmoNITB via its SMPP interface # if you want to know what's happening -logging.basicConfig(level='DEBUG') +logging.basicConfig(level = logging.DEBUG, + format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") def send_message(dest, string): parts, encoding_flag, msg_type_flag = smpplib.gsm.make_parts(string) -- To view, visit https://gerrit.osmocom.org/11159 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: I80cd7cdfa41ae7e70a1890d88c8b2f7357a500af Gerrit-Change-Number: 11159 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 10:22:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 30 Sep 2018 10:22:11 +0000 Subject: Change in mncc-python[master]: manual_test_server.py: drop redundant print() calls Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11160 Change subject: manual_test_server.py: drop redundant print() calls ...................................................................... manual_test_server.py: drop redundant print() calls Change-Id: Id9c8fa9e65837822002b68d10af9c2eacb818aac --- M contrib/manual_test_server.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/60/11160/1 diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py index d92eb84..7338129 100644 --- a/contrib/manual_test_server.py +++ b/contrib/manual_test_server.py @@ -127,5 +127,3 @@ continue print(msg) - print(msg.msg_type) -print(type(msg)) -- To view, visit https://gerrit.osmocom.org/11160 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: Id9c8fa9e65837822002b68d10af9c2eacb818aac Gerrit-Change-Number: 11160 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 10:22:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 30 Sep 2018 10:22:12 +0000 Subject: Change in mncc-python[master]: *.py: use generic logging framework instead of print() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11161 Change subject: *.py: use generic logging framework instead of print() ...................................................................... *.py: use generic logging framework instead of print() Change-Id: I025ddae64e41319abac8e2cd2e266db83aea4a7b --- M contrib/manual_test_server.py M gsm_call_fsm.py M mncc_sock.py M mncc_test.py M smpp_test.py 5 files changed, 28 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/61/11161/1 diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py index 7338129..4b2b5bd 100644 --- a/contrib/manual_test_server.py +++ b/contrib/manual_test_server.py @@ -91,39 +91,39 @@ # Say hello and set-up a call conn.send_msg(MnccMessageBuilder.build_hello()) conn.send_msg(MnccMessageBuilder.build_setup_ind("1234", "5000")) -print("=> Sent hello + setup indication") +log.info("=> Sent hello + setup indication") # Wait for the RTP crate.. and actknowledge it.. msg = conn.recv() assert msg.msg_type == mncc.MNCC_RTP_CREATE -print("<= Received request to create a RTP socket") +log.info("<= Received request to create a RTP socket") conn.send_msg(MnccMessageBuilder.build_rtp_msg(mncc.MNCC_RTP_CREATE, msg.callref, #socket.INADDR_LOOPBACK, 4000)) socket.INADDR_ANY, 4000)) -print("=> Claimed socket was created...") +log.info("=> Claimed socket was created...") msg = conn.recv() assert msg.msg_type == mncc.MNCC_CALL_PROC_REQ -print("<= Received proceeding...") +log.info("<= Received proceeding...") while True: msg = conn.recv() if msg.msg_type == mncc.MNCC_ALERT_REQ: - print("=> I should alert...") + log.info("=> I should alert...") continue if msg.msg_type == mncc.MNCC_RTP_CONNECT: conn.send_msg(MnccMessageBuilder.build_rtp_msg(mncc.MNCC_RTP_CONNECT, msg.callref, socket.INADDR_LOOPBACK, 4000)) - print("=> I needed to connect RTP...") + log.info("=> I needed to connect RTP...") continue if msg.msg_type == mncc.MNCC_SETUP_RSP: - print("=> Call is connected?") + log.info("=> Call is connected?") conn.send_msg(MnccMessageBuilder.build_setup_cmpl_ind(msg.callref)) send_dtmf(msg.callref) continue - print(msg) + log.debug(msg) diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py index c62df0c..a9ad8c0 100644 --- a/gsm_call_fsm.py +++ b/gsm_call_fsm.py @@ -13,6 +13,8 @@ import ctypes import pykka +import logging as log + from fysom import Fysom from mncc_sock import mncc_msg, mncc_number, mncc_rtp_msg, mncc_bridge_msg, mncc_bearer_cap @@ -76,7 +78,7 @@ return GsmCallFsm.last_callref; def _printstatechange(self, e): - print '%s: event: %s, %s -> %s' % (self, e.event, e.src, e.dst) + log.debug('%s: event: %s, %s -> %s' % (self, e.event, e.src, e.dst)) if self.ctrl_ref != None: self.ctrl_ref.tell({'type':'call_state_change', 'called':self.called, 'old_state':e.src, 'new_state':e.dst}) @@ -98,7 +100,7 @@ def _onmncc_call_conf_ind(self, e): msg_in = e.args[0] codec = self.find_matching_codec(msg_in.bearer_cap.speech_ver) - print '%s: CALL-CONF.ind(selected codec = %s)' % (self, codec) + log.info('%s: CALL-CONF.ind(selected codec = %s)' % (self, codec)) # select the according lchan_mode lchan_mode = codec.to_lchan_mode() msg = mncc_msg(msg_type = mncc.MNCC_LCHAN_MODIFY, callref = msg_in.callref, lchan_mode = lchan_mode) @@ -292,7 +294,7 @@ if message['type'] == 'mncc': msg = message['msg'] if msg.callref == self.callref: - print '%s: on_receive(mncc, %s)' % (self, msg) + log.debug('%s: on_receive(mncc, %s)' % (self, msg)) return self._handle_mncc(msg) elif message['type'] == 'start_mt_call': self.start_mt_call(message['calling'], message['called']) @@ -326,7 +328,7 @@ self.call_b.tell({'type':'start_mt_call', 'calling':self.msisdn_a, 'called':self.msisdn_b}) def rtp_created(self, msisdn, rtp): - print 'CallConnector:rtp_created(%s) %s' % (msisdn, rtp) + log.info('CallConnector:rtp_created(%s) %s' % (msisdn, rtp)) if self.rtp_bridge == False: raise Exception('GsmCallConnector', 'rtp_created but not in RTP bridge mode') if msisdn == self.msisdn_a: # A->B leg @@ -345,7 +347,8 @@ self.mncc_act.tell({'type': 'send', 'msg': msg}) def call_state_change(self, msisdn, old_state, new_state): - print 'CallConnector:leg_state_change(%s) %s -> %s' % (msisdn, old_state, new_state) + log.debug('CallConnector:leg_state_change(%s) %s -> %s' + % (msisdn, old_state, new_state)) if msisdn == self.msisdn_a: # A->B leg self.state_a = new_state elif msisdn == self.msisdn_b: # B->A leg @@ -353,7 +356,7 @@ if self.rtp_bridge == False and self.state_a == 'ACTIVE' and self.state_b == 'ACTIVE': self.bridge_legs() if self.state_a == 'NULL' and self.state_b == 'NULL': - print 'Both A and B in state NULL -> Terminating' + log.info('Both A and B in state NULL -> Terminating') self.stop() def on_receive(self, message): diff --git a/mncc_sock.py b/mncc_sock.py index 0a64a81..009a476 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -9,6 +9,7 @@ # Licensed under GNU General Public License, Version 2 or at your # option, any later version. +import logging as log import socket import os import mncc @@ -120,14 +121,14 @@ def __init__(self, address = '/tmp/bsc_mncc'): super(MnccSocketBase, self).__init__() self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) - print('connecting to %s' % address) + log.info('Connecting to %s' % address) self.sock.connect(address) # Check the HELLO message self.check_hello() def check_hello(self): - print('Waiting for HELLO message...') + log.debug('Waiting for HELLO message...') msg = self.recv() # Match expected message type @@ -149,7 +150,7 @@ msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): raise AssertionError('MNCC message alignment mismatch\n') - print('Received %s' % msg) + log.info('Received %s' % msg) class MnccSocketServer(object): def __init__(self, address = '/tmp/bsc_mncc'): diff --git a/mncc_test.py b/mncc_test.py index 9222605..508c5be 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -13,7 +13,7 @@ from mncc_sock import MnccSocket from thread import start_new_thread import pykka -import logging +import logging as log import signal, sys, time import readline, code @@ -26,7 +26,7 @@ def on_receive(self, message): if message['type'] == 'send': msg = message['msg'] - print 'MnccActor TxMNCC %s' % msg + log.debug('MnccActor TxMNCC %s' % msg) mncc_sock.send(msg) else: raise Exception('mncc', 'MnccActor Received unhandled %s' % message) @@ -36,10 +36,10 @@ while 1: msg = mncc_sock.recv() if msg.is_frame(): - print("Dropping traffic frame: %s" % msg) + log.warning("Dropping traffic frame: %s" % msg) continue - print "MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg + log.debug("MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg) # we simply broadcast to all calls pykka.ActorRegistry.broadcast({'type': 'mncc', 'msg': msg}, GsmCallFsm) @@ -48,7 +48,7 @@ pykka.ActorRegistry.stop_all() sys.exit(0) -logging.basicConfig(level = logging.DEBUG, +log.basicConfig(level = log.DEBUG, format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") signal.signal(signal.SIGINT, sigint_handler) diff --git a/smpp_test.py b/smpp_test.py index ad7d4dc..71eba91 100755 --- a/smpp_test.py +++ b/smpp_test.py @@ -17,7 +17,7 @@ def send_message(dest, string): parts, encoding_flag, msg_type_flag = smpplib.gsm.make_parts(string) - print 'Sending SMS "%s" to %s' % (string, dest) + log.info('Sending SMS "%s" to %s' % (string, dest)) for part in parts: pdu = client.send_message( source_addr_ton=smpplib.consts.SMPP_TON_INTL, @@ -32,7 +32,7 @@ esm_class=smpplib.consts.SMPP_MSGMODE_FORWARD, registered_delivery=False, ) - print(pdu.sequence) + log.debug(pdu.sequence) client = smpplib.client.Client('127.0.0.1', 2775) -- To view, visit https://gerrit.osmocom.org/11161 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: I025ddae64e41319abac8e2cd2e266db83aea4a7b Gerrit-Change-Number: 11161 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 11:45:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 30 Sep 2018 11:45:52 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11162 Change subject: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' ...................................................................... contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' The '--with-osmo-pcu' flag dates back to a time where the 'pcu_interface' header was not copied in both repositories and you had to point one to the other. Change-Id: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 --- M contrib/jenkins_bts_trx.sh M contrib/jenkins_oct_and_bts_trx.sh 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/11162/1 diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh index 1b723e6..54efa56 100755 --- a/contrib/jenkins_bts_trx.sh +++ b/contrib/jenkins_bts_trx.sh @@ -16,7 +16,6 @@ configure_flags="\ --enable-sanitize \ --enable-werror \ - --with-osmo-pcu=$deps/osmo-pcu/include \ --enable-trx \ " diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh index 049f5f7..67f67aa 100755 --- a/contrib/jenkins_oct_and_bts_trx.sh +++ b/contrib/jenkins_oct_and_bts_trx.sh @@ -17,7 +17,6 @@ configure_flags="\ --enable-werror \ - --with-osmo-pcu=$deps/osmo-pcu/include \ --with-octsdr-2g=$deps/layer1-headers/ \ --enable-octphy \ --enable-trx \ -- To view, visit https://gerrit.osmocom.org/11162 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: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 Gerrit-Change-Number: 11162 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 11:49:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 30 Sep 2018 11:49:29 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11162 ) Change subject: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' ...................................................................... contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' The '--with-osmo-pcu' flag dates back to a time where the 'pcu_interface' header was not copied in both repositories and you had to point one to the other. Change-Id: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 Closes OS#3514 --- M contrib/jenkins_bts_trx.sh M contrib/jenkins_oct_and_bts_trx.sh 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/11162/2 -- To view, visit https://gerrit.osmocom.org/11162 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: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 Gerrit-Change-Number: 11162 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:27:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:27:08 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11162 ) Change subject: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11162 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: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 Gerrit-Change-Number: 11162 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 30 Sep 2018 12:27:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:27:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:27:09 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11162 ) Change subject: contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' ...................................................................... contrib/jenkins_*.sh: drop rudimentary '--with-osmo-pcu' The '--with-osmo-pcu' flag dates back to a time where the 'pcu_interface' header was not copied in both repositories and you had to point one to the other. Change-Id: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 Closes OS#3514 --- M contrib/jenkins_bts_trx.sh M contrib/jenkins_oct_and_bts_trx.sh 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh index 1b723e6..54efa56 100755 --- a/contrib/jenkins_bts_trx.sh +++ b/contrib/jenkins_bts_trx.sh @@ -16,7 +16,6 @@ configure_flags="\ --enable-sanitize \ --enable-werror \ - --with-osmo-pcu=$deps/osmo-pcu/include \ --enable-trx \ " diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh index 049f5f7..67f67aa 100755 --- a/contrib/jenkins_oct_and_bts_trx.sh +++ b/contrib/jenkins_oct_and_bts_trx.sh @@ -17,7 +17,6 @@ configure_flags="\ --enable-werror \ - --with-osmo-pcu=$deps/osmo-pcu/include \ --with-octsdr-2g=$deps/layer1-headers/ \ --enable-octphy \ --enable-trx \ -- To view, visit https://gerrit.osmocom.org/11162 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: I79e494484cb099cc9ca8c27c38b785c5ea8c3bc6 Gerrit-Change-Number: 11162 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy 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 Sep 30 12:27:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:27:35 +0000 Subject: Change in mncc-python[master]: *.py: use proper '#!/usr/bin/env' shebang In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11152 ) Change subject: *.py: use proper '#!/usr/bin/env' shebang ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11152 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: Ib729ece0c95254dc2b235f90eb731681df955bd1 Gerrit-Change-Number: 11152 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:27:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:27:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:27:57 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: parse and match MNCC_SOCKET_HELLO message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11153 ) Change subject: mncc_sock.py: parse and match MNCC_SOCKET_HELLO message ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11153 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: If6c3ca37a83db1d4ae75796f7be687601b159136 Gerrit-Change-Number: 11153 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:27: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 Sep 30 12:28:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:28:26 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: share common send() / receive() calls In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11154 ) Change subject: mncc_sock.py: share common send() / receive() calls ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11154 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: I871c72c8e3392a1be76e0126a24b3bc9a787113d Gerrit-Change-Number: 11154 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:28: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 Sep 30 12:28:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:28:47 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: simplify msg_type matching In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11155 ) Change subject: mncc_sock.py: simplify msg_type matching ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11155 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: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d Gerrit-Change-Number: 11155 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:28:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:29:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:29:12 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: distinguish traffic frames In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11156 ) Change subject: mncc_sock.py: distinguish traffic frames ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11156 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: I996513e433bb57f12a4030391697f4e87e6ff938 Gerrit-Change-Number: 11156 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:29: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 Sep 30 12:29:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:29:38 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: throw / raise exceptions from MnccSocket In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11158 ) Change subject: mncc_sock.py: throw / raise exceptions from MnccSocket ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11158 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: I485eb86c69e74693eeae89723de27e376585f1da Gerrit-Change-Number: 11158 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:29: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 Sep 30 12:30:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:01 +0000 Subject: Change in mncc-python[master]: *.py: cosmetic: tweak the global logging format In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11159 ) Change subject: *.py: cosmetic: tweak the global logging format ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11159 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: I80cd7cdfa41ae7e70a1890d88c8b2f7357a500af Gerrit-Change-Number: 11159 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:30:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:13 +0000 Subject: Change in mncc-python[master]: manual_test_server.py: drop redundant print() calls In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11160 ) Change subject: manual_test_server.py: drop redundant print() calls ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11160 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: Id9c8fa9e65837822002b68d10af9c2eacb818aac Gerrit-Change-Number: 11160 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:30:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:30:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:36 +0000 Subject: Change in mncc-python[master]: *.py: use generic logging framework instead of print() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11161 ) Change subject: *.py: use generic logging framework instead of print() ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11161 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: I025ddae64e41319abac8e2cd2e266db83aea4a7b Gerrit-Change-Number: 11161 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 30 Sep 2018 12:30: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 Sep 30 12:30:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:37 +0000 Subject: Change in mncc-python[master]: *.py: use proper '#!/usr/bin/env' shebang In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11152 ) Change subject: *.py: use proper '#!/usr/bin/env' shebang ...................................................................... *.py: use proper '#!/usr/bin/env' shebang Using hard-coded paths in shebang is a bad idea, because on different systems Python interpreter can be installed in different places. See: https://mail.python.org/pipermail/tutor/2007-June/054816.html Change-Id: Ib729ece0c95254dc2b235f90eb731681df955bd1 --- M gsm_call_fsm.py M mncc_sock.py M mncc_test.py M smpp_test.py 4 files changed, 5 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py index 167a805..c62df0c 100644 --- a/gsm_call_fsm.py +++ b/gsm_call_fsm.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Python implementation of GSM 04.08 call state machine for use with # OsmoNITB MNCC interface diff --git a/mncc_sock.py b/mncc_sock.py index 3cc1ba1..22fe034 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Python interface to OsmoNITB MNCC (Mobile Network Call Control) # interface diff --git a/mncc_test.py b/mncc_test.py index f9d102b..de35fe6 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Python testing tool for establishing calls via the OsmoNITB MNCC # interface. diff --git a/smpp_test.py b/smpp_test.py index e2c2ee0..181f60d 100755 --- a/smpp_test.py +++ b/smpp_test.py @@ -1,4 +1,5 @@ -#!/usr/bin/python +#!/usr/bin/env python2 + import logging import sys -- To view, visit https://gerrit.osmocom.org/11152 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: Ib729ece0c95254dc2b235f90eb731681df955bd1 Gerrit-Change-Number: 11152 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 Sun Sep 30 12:30:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:37 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: parse and match MNCC_SOCKET_HELLO message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11153 ) Change subject: mncc_sock.py: parse and match MNCC_SOCKET_HELLO message ...................................................................... mncc_sock.py: parse and match MNCC_SOCKET_HELLO message Change-Id: If6c3ca37a83db1d4ae75796f7be687601b159136 --- M mncc_sock.py 1 file changed, 44 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/mncc_sock.py b/mncc_sock.py index 22fe034..34ab361 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -4,6 +4,7 @@ # interface # # (C) 2015 by Harald Welte +# (C) 2018 by Vadim Yanitskiy # # Licensed under GNU General Public License, Version 2 or at your # option, any later version. @@ -25,6 +26,17 @@ def __unicode__(self): return u'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) +class mncc_hello_msg(mncc.gsm_mncc_hello): + def send(self): + return buffer(self)[:] + def receive(self, bytes): + fit = min(len(bytes), ctypes.sizeof(self)) + ctypes.memmove(ctypes.addressof(self), bytes, fit) + def __str__(self): + return 'mncc_hello_msg(version=0x%04x)' % (self.version) + def __unicode__(self): + return u'mncc_hello_msg(version=0x%04x)' % (self.version) + class mncc_rtp_msg(mncc.gsm_mncc_rtp): def send(self): return buffer(self)[:] @@ -79,6 +91,9 @@ if ms.msg_type == mncc.MNCC_RTP_CREATE or ms.msg_type == mncc.MNCC_RTP_CONNECT or ms.msg_type == mncc.MNCC_RTP_FREE: ms = mncc_rtp_msg() ms.receive(data) + elif ms.msg_type == mncc.MNCC_SOCKET_HELLO: + ms = mncc_hello_msg() + ms.receive(data) return ms class MnccSocket(MnccSocketBase): @@ -92,9 +107,37 @@ sys.stderr.write("%s\n" % errmsg) sys.exit(1) - # FIXME: parse the HELLO message + # Check the HELLO message + self.check_hello() + + def check_hello(self): + print('Waiting for HELLO message...') msg = self.recv() + # Match expected message type + if msg.msg_type != mncc.MNCC_SOCKET_HELLO: + sys.stderr.write('Received an unknown (!= MNCC_SOCKET_HELLO) ' + 'message: %s\n' % msg) + sys.exit(1) + + # Match expected protocol version + if msg.version != mncc.MNCC_SOCK_VERSION: + sys.stderr.write('MNCC protocol version mismatch ' + '(0x%04x vs 0x%04x)\n' % (msg.version, mncc.MNCC_SOCK_VERSION)) + sys.exit(1) + + # Match expected message sizes / offsets + if (msg.mncc_size != ctypes.sizeof(mncc.gsm_mncc) or + msg.data_frame_size != ctypes.sizeof(mncc.gsm_data_frame) or + msg.called_offset != mncc.gsm_mncc.called.offset or + msg.signal_offset != mncc.gsm_mncc.signal.offset or + msg.emergency_offset != mncc.gsm_mncc.emergency.offset or + msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): + sys.stderr.write('MNCC message alignment mismatch\n') + sys.exit(1) + + print('Received %s' % msg) + class MnccSocketServer(object): def __init__(self, address = '/tmp/bsc_mncc'): os.unlink(address) -- To view, visit https://gerrit.osmocom.org/11153 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: If6c3ca37a83db1d4ae75796f7be687601b159136 Gerrit-Change-Number: 11153 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 Sun Sep 30 12:30:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:38 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: share common send() / receive() calls In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11154 ) Change subject: mncc_sock.py: share common send() / receive() calls ...................................................................... mncc_sock.py: share common send() / receive() calls Change-Id: I871c72c8e3392a1be76e0126a24b3bc9a787113d --- M mncc_sock.py 1 file changed, 6 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/mncc_sock.py b/mncc_sock.py index 34ab361..9887471 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -15,45 +15,32 @@ import mncc import ctypes -class mncc_msg(mncc.gsm_mncc): +class mncc_msg_common: def send(self): return buffer(self)[:] def receive(self, bytes): fit = min(len(bytes), ctypes.sizeof(self)) ctypes.memmove(ctypes.addressof(self), bytes, fit) + +class mncc_msg(mncc.gsm_mncc, mncc_msg_common): def __str__(self): return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) def __unicode__(self): return u'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) -class mncc_hello_msg(mncc.gsm_mncc_hello): - def send(self): - return buffer(self)[:] - def receive(self, bytes): - fit = min(len(bytes), ctypes.sizeof(self)) - ctypes.memmove(ctypes.addressof(self), bytes, fit) +class mncc_hello_msg(mncc.gsm_mncc_hello, mncc_msg_common): def __str__(self): return 'mncc_hello_msg(version=0x%04x)' % (self.version) def __unicode__(self): return u'mncc_hello_msg(version=0x%04x)' % (self.version) -class mncc_rtp_msg(mncc.gsm_mncc_rtp): - def send(self): - return buffer(self)[:] - def receive(self, bytes): - fit = min(len(bytes), ctypes.sizeof(self)) - ctypes.memmove(ctypes.addressof(self), bytes, fit) +class mncc_rtp_msg(mncc.gsm_mncc_rtp, mncc_msg_common): def __str__(self): return 'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) def __unicode__(self): return u'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) -class mncc_bridge_msg(mncc.gsm_mncc_bridge): - def send(self): - return buffer(self)[:] - def receive(self, bytes): - fit = min(len(bytes), ctypes.sizeof(self)) - ctypes.memmove(ctypes.addressof(self), bytes, fit) +class mncc_bridge_msg(mncc.gsm_mncc_bridge, mncc_msg_common): def __str__(self): return 'mncc_bridge_msg(%u, %u)' % (self.callref[0], self.callref[1]) def __unicode__(self): -- To view, visit https://gerrit.osmocom.org/11154 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: I871c72c8e3392a1be76e0126a24b3bc9a787113d Gerrit-Change-Number: 11154 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 Sun Sep 30 12:30:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:38 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: simplify msg_type matching In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11155 ) Change subject: mncc_sock.py: simplify msg_type matching ...................................................................... mncc_sock.py: simplify msg_type matching Change-Id: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d --- M mncc_sock.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/mncc_sock.py b/mncc_sock.py index 9887471..1c4f6be 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -22,6 +22,11 @@ fit = min(len(bytes), ctypes.sizeof(self)) ctypes.memmove(ctypes.addressof(self), bytes, fit) + # Message type matching + def is_rtp(self): + return self.msg_type in (mncc.MNCC_RTP_CREATE, + mncc.MNCC_RTP_CONNECT, mncc.MNCC_RTP_FREE) + class mncc_msg(mncc.gsm_mncc, mncc_msg_common): def __str__(self): return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) @@ -75,7 +80,7 @@ data = self.sock.recv(1500) ms = mncc_msg() ms.receive(data) - if ms.msg_type == mncc.MNCC_RTP_CREATE or ms.msg_type == mncc.MNCC_RTP_CONNECT or ms.msg_type == mncc.MNCC_RTP_FREE: + if ms.is_rtp(): ms = mncc_rtp_msg() ms.receive(data) elif ms.msg_type == mncc.MNCC_SOCKET_HELLO: -- To view, visit https://gerrit.osmocom.org/11155 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: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d Gerrit-Change-Number: 11155 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 Sun Sep 30 12:30:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:39 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: distinguish traffic frames In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11156 ) Change subject: mncc_sock.py: distinguish traffic frames ...................................................................... mncc_sock.py: distinguish traffic frames Change-Id: I996513e433bb57f12a4030391697f4e87e6ff938 --- M mncc_sock.py M mncc_test.py 2 files changed, 33 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/mncc_sock.py b/mncc_sock.py index 1c4f6be..e71a39a 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -26,6 +26,10 @@ def is_rtp(self): return self.msg_type in (mncc.MNCC_RTP_CREATE, mncc.MNCC_RTP_CONNECT, mncc.MNCC_RTP_FREE) + def is_frame(self): + return self.msg_type in (mncc.GSM_TCHF_FRAME, + mncc.GSM_TCHH_FRAME, mncc.GSM_TCHF_FRAME_EFR, + mncc.GSM_TCH_FRAME_AMR, mncc.GSM_BAD_FRAME) class mncc_msg(mncc.gsm_mncc, mncc_msg_common): def __str__(self): @@ -39,6 +43,28 @@ def __unicode__(self): return u'mncc_hello_msg(version=0x%04x)' % (self.version) +class mncc_data_frame_msg(mncc.gsm_data_frame, mncc_msg_common): + def __str__(self): + return 'mncc_data_frame(type=0x%04x, codec=%s, callref=%u)' \ + % (self.msg_type, self.codec_str(), self.callref) + def __unicode__(self): + return u'mncc_data_frame(type=0x%04x, codec=%s, callref=%u)' \ + % (self.msg_type, self.codec_str(), self.callref) + + def codec_str(self): + if self.msg_type == mncc.GSM_TCHF_FRAME: + return "FR" + elif self.msg_type == mncc.GSM_TCHH_FRAME: + return "HR" + elif self.msg_type == mncc.GSM_TCHF_FRAME_EFR: + return "EFR" + elif self.msg_type == mncc.GSM_TCH_FRAME_AMR: + return "AMR" + elif self.msg_type == mncc.GSM_BAD_FRAME: + return "(BFI)" + else: + return "(???)" + class mncc_rtp_msg(mncc.gsm_mncc_rtp, mncc_msg_common): def __str__(self): return 'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) @@ -83,6 +109,9 @@ if ms.is_rtp(): ms = mncc_rtp_msg() ms.receive(data) + elif ms.is_frame(): + ms = mncc_data_frame_msg() + ms.receive(data) elif ms.msg_type == mncc.MNCC_SOCKET_HELLO: ms = mncc_hello_msg() ms.receive(data) diff --git a/mncc_test.py b/mncc_test.py index de35fe6..df66efb 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -35,6 +35,10 @@ def mncc_rx_thread(mncc_sock): while 1: msg = mncc_sock.recv() + if msg.is_frame(): + print("Dropping traffic frame: %s" % msg) + continue + print "MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg # we simply broadcast to all calls pykka.ActorRegistry.broadcast({'type': 'mncc', 'msg': msg}, GsmCallFsm) -- To view, visit https://gerrit.osmocom.org/11156 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: I996513e433bb57f12a4030391697f4e87e6ff938 Gerrit-Change-Number: 11156 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 Sun Sep 30 12:30:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:39 +0000 Subject: Change in mncc-python[master]: mncc_sock.py: throw / raise exceptions from MnccSocket In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11158 ) Change subject: mncc_sock.py: throw / raise exceptions from MnccSocket ...................................................................... mncc_sock.py: throw / raise exceptions from MnccSocket Calling sys.exit() from MnccSocket's constructor could lead to a situation when the main thread becomes "dead", while its child threads are still working. Let's throw the exceptions towards the caller, so it would be possible to handle them there. Change-Id: I485eb86c69e74693eeae89723de27e376585f1da --- M mncc_sock.py 1 file changed, 4 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/mncc_sock.py b/mncc_sock.py index e71a39a..0a64a81 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -10,7 +10,6 @@ # option, any later version. import socket -import sys import os import mncc import ctypes @@ -122,11 +121,7 @@ super(MnccSocketBase, self).__init__() self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) print('connecting to %s' % address) - try: - self.sock.connect(address) - except socket.error as errmsg: - sys.stderr.write("%s\n" % errmsg) - sys.exit(1) + self.sock.connect(address) # Check the HELLO message self.check_hello() @@ -137,15 +132,13 @@ # Match expected message type if msg.msg_type != mncc.MNCC_SOCKET_HELLO: - sys.stderr.write('Received an unknown (!= MNCC_SOCKET_HELLO) ' + raise AssertionError('Received an unknown (!= MNCC_SOCKET_HELLO) ' 'message: %s\n' % msg) - sys.exit(1) # Match expected protocol version if msg.version != mncc.MNCC_SOCK_VERSION: - sys.stderr.write('MNCC protocol version mismatch ' + raise AssertionError('MNCC protocol version mismatch ' '(0x%04x vs 0x%04x)\n' % (msg.version, mncc.MNCC_SOCK_VERSION)) - sys.exit(1) # Match expected message sizes / offsets if (msg.mncc_size != ctypes.sizeof(mncc.gsm_mncc) or @@ -154,8 +147,7 @@ msg.signal_offset != mncc.gsm_mncc.signal.offset or msg.emergency_offset != mncc.gsm_mncc.emergency.offset or msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): - sys.stderr.write('MNCC message alignment mismatch\n') - sys.exit(1) + raise AssertionError('MNCC message alignment mismatch\n') print('Received %s' % msg) -- To view, visit https://gerrit.osmocom.org/11158 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: I485eb86c69e74693eeae89723de27e376585f1da Gerrit-Change-Number: 11158 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 Sun Sep 30 12:30:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:39 +0000 Subject: Change in mncc-python[master]: *.py: cosmetic: tweak the global logging format In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11159 ) Change subject: *.py: cosmetic: tweak the global logging format ...................................................................... *.py: cosmetic: tweak the global logging format Printing log level, file name, and line number together with a log message is the common practice in Osmocom projects that facilitates debugging and development. Change-Id: I80cd7cdfa41ae7e70a1890d88c8b2f7357a500af --- M contrib/manual_test_server.py M mncc_test.py M smpp_test.py 3 files changed, 9 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py index 5625670..d92eb84 100644 --- a/contrib/manual_test_server.py +++ b/contrib/manual_test_server.py @@ -3,6 +3,8 @@ import ctypes import socket +import logging as log + GSM340_PLAN_ISDN = 1 GSM340_TYPE_NATIONAL = 2 @@ -80,6 +82,9 @@ conn.send_msg(MnccMessageBuilder.build_dtmf_stop(callref, '2')) +log.basicConfig(level = log.DEBUG, + format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") + server = mncc_sock.MnccSocketServer() conn = server.accept() diff --git a/mncc_test.py b/mncc_test.py index df66efb..9222605 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -48,7 +48,8 @@ pykka.ActorRegistry.stop_all() sys.exit(0) -logging.basicConfig(level=logging.DEBUG) +logging.basicConfig(level = logging.DEBUG, + format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") signal.signal(signal.SIGINT, sigint_handler) diff --git a/smpp_test.py b/smpp_test.py index 181f60d..ad7d4dc 100755 --- a/smpp_test.py +++ b/smpp_test.py @@ -11,7 +11,8 @@ # to generate some SMS load on OsmoNITB via its SMPP interface # if you want to know what's happening -logging.basicConfig(level='DEBUG') +logging.basicConfig(level = logging.DEBUG, + format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") def send_message(dest, string): parts, encoding_flag, msg_type_flag = smpplib.gsm.make_parts(string) -- To view, visit https://gerrit.osmocom.org/11159 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: I80cd7cdfa41ae7e70a1890d88c8b2f7357a500af Gerrit-Change-Number: 11159 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 Sun Sep 30 12:30:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:40 +0000 Subject: Change in mncc-python[master]: manual_test_server.py: drop redundant print() calls In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11160 ) Change subject: manual_test_server.py: drop redundant print() calls ...................................................................... manual_test_server.py: drop redundant print() calls Change-Id: Id9c8fa9e65837822002b68d10af9c2eacb818aac --- M contrib/manual_test_server.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py index d92eb84..7338129 100644 --- a/contrib/manual_test_server.py +++ b/contrib/manual_test_server.py @@ -127,5 +127,3 @@ continue print(msg) - print(msg.msg_type) -print(type(msg)) -- To view, visit https://gerrit.osmocom.org/11160 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: Id9c8fa9e65837822002b68d10af9c2eacb818aac Gerrit-Change-Number: 11160 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 Sun Sep 30 12:30:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:30:40 +0000 Subject: Change in mncc-python[master]: *.py: use generic logging framework instead of print() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11161 ) Change subject: *.py: use generic logging framework instead of print() ...................................................................... *.py: use generic logging framework instead of print() Change-Id: I025ddae64e41319abac8e2cd2e266db83aea4a7b --- M contrib/manual_test_server.py M gsm_call_fsm.py M mncc_sock.py M mncc_test.py M smpp_test.py 5 files changed, 28 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py index 7338129..4b2b5bd 100644 --- a/contrib/manual_test_server.py +++ b/contrib/manual_test_server.py @@ -91,39 +91,39 @@ # Say hello and set-up a call conn.send_msg(MnccMessageBuilder.build_hello()) conn.send_msg(MnccMessageBuilder.build_setup_ind("1234", "5000")) -print("=> Sent hello + setup indication") +log.info("=> Sent hello + setup indication") # Wait for the RTP crate.. and actknowledge it.. msg = conn.recv() assert msg.msg_type == mncc.MNCC_RTP_CREATE -print("<= Received request to create a RTP socket") +log.info("<= Received request to create a RTP socket") conn.send_msg(MnccMessageBuilder.build_rtp_msg(mncc.MNCC_RTP_CREATE, msg.callref, #socket.INADDR_LOOPBACK, 4000)) socket.INADDR_ANY, 4000)) -print("=> Claimed socket was created...") +log.info("=> Claimed socket was created...") msg = conn.recv() assert msg.msg_type == mncc.MNCC_CALL_PROC_REQ -print("<= Received proceeding...") +log.info("<= Received proceeding...") while True: msg = conn.recv() if msg.msg_type == mncc.MNCC_ALERT_REQ: - print("=> I should alert...") + log.info("=> I should alert...") continue if msg.msg_type == mncc.MNCC_RTP_CONNECT: conn.send_msg(MnccMessageBuilder.build_rtp_msg(mncc.MNCC_RTP_CONNECT, msg.callref, socket.INADDR_LOOPBACK, 4000)) - print("=> I needed to connect RTP...") + log.info("=> I needed to connect RTP...") continue if msg.msg_type == mncc.MNCC_SETUP_RSP: - print("=> Call is connected?") + log.info("=> Call is connected?") conn.send_msg(MnccMessageBuilder.build_setup_cmpl_ind(msg.callref)) send_dtmf(msg.callref) continue - print(msg) + log.debug(msg) diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py index c62df0c..a9ad8c0 100644 --- a/gsm_call_fsm.py +++ b/gsm_call_fsm.py @@ -13,6 +13,8 @@ import ctypes import pykka +import logging as log + from fysom import Fysom from mncc_sock import mncc_msg, mncc_number, mncc_rtp_msg, mncc_bridge_msg, mncc_bearer_cap @@ -76,7 +78,7 @@ return GsmCallFsm.last_callref; def _printstatechange(self, e): - print '%s: event: %s, %s -> %s' % (self, e.event, e.src, e.dst) + log.debug('%s: event: %s, %s -> %s' % (self, e.event, e.src, e.dst)) if self.ctrl_ref != None: self.ctrl_ref.tell({'type':'call_state_change', 'called':self.called, 'old_state':e.src, 'new_state':e.dst}) @@ -98,7 +100,7 @@ def _onmncc_call_conf_ind(self, e): msg_in = e.args[0] codec = self.find_matching_codec(msg_in.bearer_cap.speech_ver) - print '%s: CALL-CONF.ind(selected codec = %s)' % (self, codec) + log.info('%s: CALL-CONF.ind(selected codec = %s)' % (self, codec)) # select the according lchan_mode lchan_mode = codec.to_lchan_mode() msg = mncc_msg(msg_type = mncc.MNCC_LCHAN_MODIFY, callref = msg_in.callref, lchan_mode = lchan_mode) @@ -292,7 +294,7 @@ if message['type'] == 'mncc': msg = message['msg'] if msg.callref == self.callref: - print '%s: on_receive(mncc, %s)' % (self, msg) + log.debug('%s: on_receive(mncc, %s)' % (self, msg)) return self._handle_mncc(msg) elif message['type'] == 'start_mt_call': self.start_mt_call(message['calling'], message['called']) @@ -326,7 +328,7 @@ self.call_b.tell({'type':'start_mt_call', 'calling':self.msisdn_a, 'called':self.msisdn_b}) def rtp_created(self, msisdn, rtp): - print 'CallConnector:rtp_created(%s) %s' % (msisdn, rtp) + log.info('CallConnector:rtp_created(%s) %s' % (msisdn, rtp)) if self.rtp_bridge == False: raise Exception('GsmCallConnector', 'rtp_created but not in RTP bridge mode') if msisdn == self.msisdn_a: # A->B leg @@ -345,7 +347,8 @@ self.mncc_act.tell({'type': 'send', 'msg': msg}) def call_state_change(self, msisdn, old_state, new_state): - print 'CallConnector:leg_state_change(%s) %s -> %s' % (msisdn, old_state, new_state) + log.debug('CallConnector:leg_state_change(%s) %s -> %s' + % (msisdn, old_state, new_state)) if msisdn == self.msisdn_a: # A->B leg self.state_a = new_state elif msisdn == self.msisdn_b: # B->A leg @@ -353,7 +356,7 @@ if self.rtp_bridge == False and self.state_a == 'ACTIVE' and self.state_b == 'ACTIVE': self.bridge_legs() if self.state_a == 'NULL' and self.state_b == 'NULL': - print 'Both A and B in state NULL -> Terminating' + log.info('Both A and B in state NULL -> Terminating') self.stop() def on_receive(self, message): diff --git a/mncc_sock.py b/mncc_sock.py index 0a64a81..009a476 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -9,6 +9,7 @@ # Licensed under GNU General Public License, Version 2 or at your # option, any later version. +import logging as log import socket import os import mncc @@ -120,14 +121,14 @@ def __init__(self, address = '/tmp/bsc_mncc'): super(MnccSocketBase, self).__init__() self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) - print('connecting to %s' % address) + log.info('Connecting to %s' % address) self.sock.connect(address) # Check the HELLO message self.check_hello() def check_hello(self): - print('Waiting for HELLO message...') + log.debug('Waiting for HELLO message...') msg = self.recv() # Match expected message type @@ -149,7 +150,7 @@ msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): raise AssertionError('MNCC message alignment mismatch\n') - print('Received %s' % msg) + log.info('Received %s' % msg) class MnccSocketServer(object): def __init__(self, address = '/tmp/bsc_mncc'): diff --git a/mncc_test.py b/mncc_test.py index 9222605..508c5be 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -13,7 +13,7 @@ from mncc_sock import MnccSocket from thread import start_new_thread import pykka -import logging +import logging as log import signal, sys, time import readline, code @@ -26,7 +26,7 @@ def on_receive(self, message): if message['type'] == 'send': msg = message['msg'] - print 'MnccActor TxMNCC %s' % msg + log.debug('MnccActor TxMNCC %s' % msg) mncc_sock.send(msg) else: raise Exception('mncc', 'MnccActor Received unhandled %s' % message) @@ -36,10 +36,10 @@ while 1: msg = mncc_sock.recv() if msg.is_frame(): - print("Dropping traffic frame: %s" % msg) + log.warning("Dropping traffic frame: %s" % msg) continue - print "MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg + log.debug("MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg) # we simply broadcast to all calls pykka.ActorRegistry.broadcast({'type': 'mncc', 'msg': msg}, GsmCallFsm) @@ -48,7 +48,7 @@ pykka.ActorRegistry.stop_all() sys.exit(0) -logging.basicConfig(level = logging.DEBUG, +log.basicConfig(level = log.DEBUG, format = "%(levelname)s %(filename)s:%(lineno)d %(message)s") signal.signal(signal.SIGINT, sigint_handler) diff --git a/smpp_test.py b/smpp_test.py index ad7d4dc..71eba91 100755 --- a/smpp_test.py +++ b/smpp_test.py @@ -17,7 +17,7 @@ def send_message(dest, string): parts, encoding_flag, msg_type_flag = smpplib.gsm.make_parts(string) - print 'Sending SMS "%s" to %s' % (string, dest) + log.info('Sending SMS "%s" to %s' % (string, dest)) for part in parts: pdu = client.send_message( source_addr_ton=smpplib.consts.SMPP_TON_INTL, @@ -32,7 +32,7 @@ esm_class=smpplib.consts.SMPP_MSGMODE_FORWARD, registered_delivery=False, ) - print(pdu.sequence) + log.debug(pdu.sequence) client = smpplib.client.Client('127.0.0.1', 2775) -- To view, visit https://gerrit.osmocom.org/11161 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: I025ddae64e41319abac8e2cd2e266db83aea4a7b Gerrit-Change-Number: 11161 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 Sun Sep 30 12:32:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:32:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: prevent division by zero In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix: prevent division by zero ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11157/1/src/host/trxcon/sched_lchan_common.c File src/host/trxcon/sched_lchan_common.c: https://gerrit.osmocom.org/#/c/11157/1/src/host/trxcon/sched_lchan_common.c at 101 PS1, Line 101: -(lchan->meas.rssi_sum / lchan->meas.rssi_num) : 0; is '0' really the lowest received level at this point? I don't recall the L1CTL conventions right now. I just think that if no measurement exists, we should assume the worst ? -- To view, visit https://gerrit.osmocom.org/11157 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: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 30 Sep 2018 12:32:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:58:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:58:12 +0000 Subject: Change in osmo-bts[master]: Fix computing CCCH block number from frame number Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11163 Change subject: Fix computing CCCH block number from frame number ...................................................................... Fix computing CCCH block number from frame number The existing implementation used a simplistic macro, which was wrong in many ways: 1) it returned a negative value for "fn % 51 < 5" conditions without raising any error message or asserting 2) it returned a wrong block number for many different input frame numbers, as it didn't account properly for the FCCH/SCH gaps between the blocks Let's replace the simplistic macro with a proper lookup table based on TS 05.02, and let's OSMO_ASSERT() if this is ever called with non-CCCH frame numbers. Change-Id: I11fd6cc558bb61c40c2019e46f56c1fe78ef39f5 Closes: OS#3024 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 5 files changed, 41 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/11163/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 3225a60..e2c92fa 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -29,7 +29,7 @@ #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f) /* CCCH block from frame number */ -#define L1SAP_FN2CCCHBLOCK(fn) ((fn % 51) / 5 - 1) +unsigned int l1sap_fn2ccch_block(uint32_t fn); /* PTCH layout from frame number */ #define L1SAP_FN2MACBLOCK(fn) ((fn % 52) / 4) diff --git a/src/common/l1sap.c b/src/common/l1sap.c index ac4f0be..0f3cd3a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -55,6 +55,41 @@ #include #include + +#define CB_FCCH -1 +#define CB_SCH -2 +#define CB_BCCH -3 +#define CB_IDLE -4 + +/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */ +static const int ccch_block_table[51] = { + CB_FCCH, CB_SCH,/* 0..1 */ + CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ + 0, 0, 0, 0, /* 6..9: B0 */ + CB_FCCH, CB_SCH,/* 10..11 */ + 1, 1, 1, 1, /* 12..15: B1 */ + 2, 2, 2, 2, /* 16..19: B2 */ + CB_FCCH, CB_SCH,/* 20..21 */ + 3, 3, 3, 3, /* 22..25: B3 */ + 4, 4, 4, 4, /* 26..29: B4 */ + CB_FCCH, CB_SCH,/* 30..31 */ + 5, 5, 5, 5, /* 32..35: B5 */ + 6, 6, 6, 6, /* 36..39: B6 */ + CB_FCCH, CB_SCH,/* 40..41 */ + 7, 7, 7, 7, /* 42..45: B7 */ + 8, 8, 8, 8, /* 46..49: B8 */ + -4 /* 50: Idle */ +}; + +/* determine the CCCH block number based on the frame number */ +unsigned int l1sap_fn2ccch_block(uint32_t fn) +{ + int rc = ccch_block_table[fn%51]; + /* if FN is negative, we were called for something that's not CCCH! */ + OSMO_ASSERT(rc >= 0); + return rc; +} + struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx, unsigned int chan_nr) { @@ -273,7 +308,7 @@ } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ - if (L1SAP_FN2CCCHBLOCK(fn) >= num_agch) + if (l1sap_fn2ccch_block(fn) >= num_agch) *chan_type = GSMTAP_CHANNEL_PCH; else *chan_type = GSMTAP_CHANNEL_AGCH; @@ -686,7 +721,7 @@ /* 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"); + return l1sap_fn2ccch_block(fn) < num_agch(trx, "PH-RTS-IND"); } /* PH-RTS-IND prim received from bts model */ diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 4093225..99852e3 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -388,7 +388,7 @@ } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ - u8BlockNbr = L1SAP_FN2CCCHBLOCK(u32Fn); + u8BlockNbr = l1sap_fn2ccch_block(u32Fn); if (u8BlockNbr >= num_agch(trx, "PH-DATA-REQ")) sapi = GsmL1_Sapi_Pch; else diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 372e332..247c371 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -385,7 +385,7 @@ } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ - u8BlockNbr = L1SAP_FN2CCCHBLOCK(u32Fn); + u8BlockNbr = l1sap_fn2ccch_block(u32Fn); if (u8BlockNbr >= 1) sapi = GsmL1_Sapi_Pch; else diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index cdbb9c1..997ccbc 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -79,7 +79,7 @@ timeslot = tn; /* in Osmocom, AGCH is only sent on ccch block 0. no idea why. this seems to cause false GSMTAP channel * types for agch and pch. */ - if (rsl_chantype == RSL_CHAN_PCH_AGCH && L1SAP_FN2CCCHBLOCK(fn) == 0) + if (rsl_chantype == RSL_CHAN_PCH_AGCH && l1sap_fn2ccch_block(fn) == 0) gsmtap_chantype = GSMTAP_CHANNEL_PCH; else gsmtap_chantype = chantype_rsl2gsmtap(rsl_chantype, chdesc->link_id); /* the logical channel type */ -- To view, visit https://gerrit.osmocom.org/11163 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: I11fd6cc558bb61c40c2019e46f56c1fe78ef39f5 Gerrit-Change-Number: 11163 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 12:58:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 12:58:13 +0000 Subject: Change in osmo-bts[master]: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11164 Change subject: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC ...................................................................... sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC Change-Id: Ifd9a3be6189b3288526e12260d68a982b089404e --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/11164/1 diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 247c371..f682ffd 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -386,7 +386,7 @@ /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ u8BlockNbr = l1sap_fn2ccch_block(u32Fn); - if (u8BlockNbr >= 1) + if (u8BlockNbr >= num_agch(trx, "PH-DATA-REQ")) sapi = GsmL1_Sapi_Pch; else sapi = GsmL1_Sapi_Agch; diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 997ccbc..2248afc 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -79,7 +79,8 @@ timeslot = tn; /* in Osmocom, AGCH is only sent on ccch block 0. no idea why. this seems to cause false GSMTAP channel * types for agch and pch. */ - if (rsl_chantype == RSL_CHAN_PCH_AGCH && l1sap_fn2ccch_block(fn) == 0) + if (rsl_chantype == RSL_CHAN_PCH_AGCH && + l1sap_fn2ccch_block(fn) >= num_agch(l1t->trx, "PH-DATA-REQ")) gsmtap_chantype = GSMTAP_CHANNEL_PCH; else gsmtap_chantype = chantype_rsl2gsmtap(rsl_chantype, chdesc->link_id); /* the logical channel type */ -- To view, visit https://gerrit.osmocom.org/11164 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: Ifd9a3be6189b3288526e12260d68a982b089404e Gerrit-Change-Number: 11164 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 13:50:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 13:50:15 +0000 Subject: Change in osmo-bts[master]: paging_test: Fix AGCH/PCH split test for second half of 102 multiframe Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11165 Change subject: paging_test: Fix AGCH/PCH split test for second half of 102 multiframe ...................................................................... paging_test: Fix AGCH/PCH split test for second half of 102 multiframe * we have to use modulo 51, not 50 * the check for FACCH/SCH has to be applied to to the fn % 51 result Change-Id: I540a7eeef3ea3ed7347f0f1b5a5a6fe7ce0ec8bb --- M tests/paging/paging_test.c M tests/paging/paging_test.ok 2 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/11165/1 diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 1fc7d92..18708e2 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -136,7 +136,7 @@ printf("Fn: AGCH: (bs_ag_blks_res=[0:7]\n"); for (fn = 0; fn < 102; fn++) { - + uint8_t fn51 = fn % 51; /* 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 @@ -144,12 +144,12 @@ * 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) + if (fn51 % 10 != 2 && fn51 % 10 != 6) continue; printf("%03u: ", fn); - if (fn % 50 == 2) { + if (fn51 == 2) { printf(" . . . . . . . . (BCCH)\n"); continue; } diff --git a/tests/paging/paging_test.ok b/tests/paging/paging_test.ok index 50006ec..927fdf9 100644 --- a/tests/paging/paging_test.ok +++ b/tests/paging/paging_test.ok @@ -11,14 +11,14 @@ 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 +053: . . . . . . . . (BCCH) +057: 0 1 1 1 1 1 1 1 +063: 0 0 1 1 1 1 1 1 +067: 0 0 0 1 1 1 1 1 +073: 0 0 0 0 1 1 1 1 +077: 0 0 0 0 0 1 1 1 +083: 0 0 0 0 0 0 1 1 +087: 0 0 0 0 0 0 0 1 +093: 0 0 0 0 0 0 0 0 +097: 0 0 0 0 0 0 0 0 Success -- To view, visit https://gerrit.osmocom.org/11165 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: I540a7eeef3ea3ed7347f0f1b5a5a6fe7ce0ec8bb Gerrit-Change-Number: 11165 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 14:10:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 14:10:29 +0000 Subject: Change in osmo-bts[master]: paging_test: Fix AGCH/PCH split test for second half of 102 multiframe In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11165 ) Change subject: paging_test: Fix AGCH/PCH split test for second half of 102 multiframe ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11165 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: I540a7eeef3ea3ed7347f0f1b5a5a6fe7ce0ec8bb Gerrit-Change-Number: 11165 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 30 Sep 2018 14:10:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 14:10:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 14:10:32 +0000 Subject: Change in osmo-bts[master]: Fix computing CCCH block number from frame number In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11163 ) Change subject: Fix computing CCCH block number from frame number ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11163 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: I11fd6cc558bb61c40c2019e46f56c1fe78ef39f5 Gerrit-Change-Number: 11163 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 30 Sep 2018 14:10:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 30 14:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 14:10:34 +0000 Subject: Change in osmo-bts[master]: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11164 ) Change subject: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11164 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: Ifd9a3be6189b3288526e12260d68a982b089404e Gerrit-Change-Number: 11164 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 30 Sep 2018 14: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 Sun Sep 30 14:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 14:10:37 +0000 Subject: Change in osmo-bts[master]: paging_test: Fix AGCH/PCH split test for second half of 102 multiframe In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11165 ) Change subject: paging_test: Fix AGCH/PCH split test for second half of 102 multiframe ...................................................................... paging_test: Fix AGCH/PCH split test for second half of 102 multiframe * we have to use modulo 51, not 50 * the check for FACCH/SCH has to be applied to to the fn % 51 result Change-Id: I540a7eeef3ea3ed7347f0f1b5a5a6fe7ce0ec8bb --- M tests/paging/paging_test.c M tests/paging/paging_test.ok 2 files changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 1fc7d92..18708e2 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -136,7 +136,7 @@ printf("Fn: AGCH: (bs_ag_blks_res=[0:7]\n"); for (fn = 0; fn < 102; fn++) { - + uint8_t fn51 = fn % 51; /* 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 @@ -144,12 +144,12 @@ * 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) + if (fn51 % 10 != 2 && fn51 % 10 != 6) continue; printf("%03u: ", fn); - if (fn % 50 == 2) { + if (fn51 == 2) { printf(" . . . . . . . . (BCCH)\n"); continue; } diff --git a/tests/paging/paging_test.ok b/tests/paging/paging_test.ok index 50006ec..927fdf9 100644 --- a/tests/paging/paging_test.ok +++ b/tests/paging/paging_test.ok @@ -11,14 +11,14 @@ 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 +053: . . . . . . . . (BCCH) +057: 0 1 1 1 1 1 1 1 +063: 0 0 1 1 1 1 1 1 +067: 0 0 0 1 1 1 1 1 +073: 0 0 0 0 1 1 1 1 +077: 0 0 0 0 0 1 1 1 +083: 0 0 0 0 0 0 1 1 +087: 0 0 0 0 0 0 0 1 +093: 0 0 0 0 0 0 0 0 +097: 0 0 0 0 0 0 0 0 Success -- To view, visit https://gerrit.osmocom.org/11165 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: I540a7eeef3ea3ed7347f0f1b5a5a6fe7ce0ec8bb Gerrit-Change-Number: 11165 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 Sep 30 14:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 14:10:37 +0000 Subject: Change in osmo-bts[master]: Fix computing CCCH block number from frame number In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11163 ) Change subject: Fix computing CCCH block number from frame number ...................................................................... Fix computing CCCH block number from frame number The existing implementation used a simplistic macro, which was wrong in many ways: 1) it returned a negative value for "fn % 51 < 5" conditions without raising any error message or asserting 2) it returned a wrong block number for many different input frame numbers, as it didn't account properly for the FCCH/SCH gaps between the blocks Let's replace the simplistic macro with a proper lookup table based on TS 05.02, and let's OSMO_ASSERT() if this is ever called with non-CCCH frame numbers. Change-Id: I11fd6cc558bb61c40c2019e46f56c1fe78ef39f5 Closes: OS#3024 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 5 files changed, 41 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 3225a60..e2c92fa 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -29,7 +29,7 @@ #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f) /* CCCH block from frame number */ -#define L1SAP_FN2CCCHBLOCK(fn) ((fn % 51) / 5 - 1) +unsigned int l1sap_fn2ccch_block(uint32_t fn); /* PTCH layout from frame number */ #define L1SAP_FN2MACBLOCK(fn) ((fn % 52) / 4) diff --git a/src/common/l1sap.c b/src/common/l1sap.c index ac4f0be..0f3cd3a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -55,6 +55,41 @@ #include #include + +#define CB_FCCH -1 +#define CB_SCH -2 +#define CB_BCCH -3 +#define CB_IDLE -4 + +/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */ +static const int ccch_block_table[51] = { + CB_FCCH, CB_SCH,/* 0..1 */ + CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ + 0, 0, 0, 0, /* 6..9: B0 */ + CB_FCCH, CB_SCH,/* 10..11 */ + 1, 1, 1, 1, /* 12..15: B1 */ + 2, 2, 2, 2, /* 16..19: B2 */ + CB_FCCH, CB_SCH,/* 20..21 */ + 3, 3, 3, 3, /* 22..25: B3 */ + 4, 4, 4, 4, /* 26..29: B4 */ + CB_FCCH, CB_SCH,/* 30..31 */ + 5, 5, 5, 5, /* 32..35: B5 */ + 6, 6, 6, 6, /* 36..39: B6 */ + CB_FCCH, CB_SCH,/* 40..41 */ + 7, 7, 7, 7, /* 42..45: B7 */ + 8, 8, 8, 8, /* 46..49: B8 */ + -4 /* 50: Idle */ +}; + +/* determine the CCCH block number based on the frame number */ +unsigned int l1sap_fn2ccch_block(uint32_t fn) +{ + int rc = ccch_block_table[fn%51]; + /* if FN is negative, we were called for something that's not CCCH! */ + OSMO_ASSERT(rc >= 0); + return rc; +} + struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx, unsigned int chan_nr) { @@ -273,7 +308,7 @@ } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ - if (L1SAP_FN2CCCHBLOCK(fn) >= num_agch) + if (l1sap_fn2ccch_block(fn) >= num_agch) *chan_type = GSMTAP_CHANNEL_PCH; else *chan_type = GSMTAP_CHANNEL_AGCH; @@ -686,7 +721,7 @@ /* 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"); + return l1sap_fn2ccch_block(fn) < num_agch(trx, "PH-RTS-IND"); } /* PH-RTS-IND prim received from bts model */ diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 4093225..99852e3 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -388,7 +388,7 @@ } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ - u8BlockNbr = L1SAP_FN2CCCHBLOCK(u32Fn); + u8BlockNbr = l1sap_fn2ccch_block(u32Fn); if (u8BlockNbr >= num_agch(trx, "PH-DATA-REQ")) sapi = GsmL1_Sapi_Pch; else diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 372e332..247c371 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -385,7 +385,7 @@ } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ - u8BlockNbr = L1SAP_FN2CCCHBLOCK(u32Fn); + u8BlockNbr = l1sap_fn2ccch_block(u32Fn); if (u8BlockNbr >= 1) sapi = GsmL1_Sapi_Pch; else diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index cdbb9c1..997ccbc 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -79,7 +79,7 @@ timeslot = tn; /* in Osmocom, AGCH is only sent on ccch block 0. no idea why. this seems to cause false GSMTAP channel * types for agch and pch. */ - if (rsl_chantype == RSL_CHAN_PCH_AGCH && L1SAP_FN2CCCHBLOCK(fn) == 0) + if (rsl_chantype == RSL_CHAN_PCH_AGCH && l1sap_fn2ccch_block(fn) == 0) gsmtap_chantype = GSMTAP_CHANNEL_PCH; else gsmtap_chantype = chantype_rsl2gsmtap(rsl_chantype, chdesc->link_id); /* the logical channel type */ -- To view, visit https://gerrit.osmocom.org/11163 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: I11fd6cc558bb61c40c2019e46f56c1fe78ef39f5 Gerrit-Change-Number: 11163 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 Sep 30 14:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Sep 2018 14:10:37 +0000 Subject: Change in osmo-bts[master]: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11164 ) Change subject: sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC ...................................................................... sysmo, virtual: properly handle BS-AG-BLKS-RES as received from BSC Change-Id: Ifd9a3be6189b3288526e12260d68a982b089404e --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 247c371..f682ffd 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -386,7 +386,7 @@ /* The sapi depends on DSP configuration, not * on the actual SYSTEM INFORMATION 3. */ u8BlockNbr = l1sap_fn2ccch_block(u32Fn); - if (u8BlockNbr >= 1) + if (u8BlockNbr >= num_agch(trx, "PH-DATA-REQ")) sapi = GsmL1_Sapi_Pch; else sapi = GsmL1_Sapi_Agch; diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 997ccbc..2248afc 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -79,7 +79,8 @@ timeslot = tn; /* in Osmocom, AGCH is only sent on ccch block 0. no idea why. this seems to cause false GSMTAP channel * types for agch and pch. */ - if (rsl_chantype == RSL_CHAN_PCH_AGCH && l1sap_fn2ccch_block(fn) == 0) + if (rsl_chantype == RSL_CHAN_PCH_AGCH && + l1sap_fn2ccch_block(fn) >= num_agch(l1t->trx, "PH-DATA-REQ")) gsmtap_chantype = GSMTAP_CHANNEL_PCH; else gsmtap_chantype = chantype_rsl2gsmtap(rsl_chantype, chdesc->link_id); /* the logical channel type */ -- To view, visit https://gerrit.osmocom.org/11164 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: Ifd9a3be6189b3288526e12260d68a982b089404e Gerrit-Change-Number: 11164 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 jenkins at lists.osmocom.org Sun Sep 30 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 30 Sep 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_#262?= In-Reply-To: <1207893089.406.1538233806998.JavaMail.jenkins@jenkins.osmocom.org> References: <1207893089.406.1538233806998.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <438756638.421.1538320206993.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 flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l 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 %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.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_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 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_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 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_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 -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_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_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_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_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 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_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 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 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_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_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_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 Sep 30 18:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Sun, 30 Sep 2018 18:54:28 +0000 Subject: Change in osmo-bsc[master]: cosmetics: Fix typo in bsc_vty.c Message-ID: roox has uploaded this change for review. ( https://gerrit.osmocom.org/11166 Change subject: cosmetics: Fix typo in bsc_vty.c ...................................................................... cosmetics: Fix typo in bsc_vty.c Change-Id: I65d3e6c6dc252fd60d2dd6b6687ceef4d75034ed --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/11166/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index d06ec57..8e6ff3e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1768,7 +1768,7 @@ DEFUN(show_paging, show_paging_cmd, "show paging [<0-255>]", - SHOW_STR "Display information about paging reuqests of a BTS\n" + SHOW_STR "Display information about paging requests of a BTS\n" BTS_NR_STR) { struct gsm_network *net = gsmnet_from_vty(vty); -- To view, visit https://gerrit.osmocom.org/11166 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: I65d3e6c6dc252fd60d2dd6b6687ceef4d75034ed Gerrit-Change-Number: 11166 Gerrit-PatchSet: 1 Gerrit-Owner: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Sep 30 19:57:01 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 30 Sep 2018 19:57:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5bb12aa3cfd59_21059b2684363482@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 159s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 159s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 159s] collect2: error: ld returned 1 exit status [ 159s] Makefile:473: recipe for target 'InterthreadTest' failed [ 159s] make[4]: *** [InterthreadTest] Error 1 [ 159s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 159s] Makefile:400: recipe for target 'all-recursive' failed [ 159s] make[3]: *** [all-recursive] Error 1 [ 159s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 159s] Makefile:515: recipe for target 'all-recursive' failed [ 159s] make[2]: *** [all-recursive] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 159s] Makefile:446: recipe for target 'all' failed [ 159s] make[1]: *** [all] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: make -j1 returned exit code 2 [ 159s] debian/rules:6: recipe for target 'build' failed [ 159s] make: *** [build] Error 2 [ 159s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 159s] [ 159s] lamb27 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:56:41 UTC 2018. [ 159s] [ 159s] ### VM INTERACTION START ### [ 163s] [ 151.477402] sysrq: SysRq : Power Off [ 163s] [ 151.482723] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] lamb27 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:56:46 UTC 2018. [ 163s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 30 19:57:53 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 30 Sep 2018 19:57:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5bb12ac28dad9_21059b26843635fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 154s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 154s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 154s] collect2: error: ld returned 1 exit status [ 154s] Makefile:473: recipe for target 'InterthreadTest' failed [ 154s] make[4]: *** [InterthreadTest] Error 1 [ 154s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 154s] Makefile:400: recipe for target 'all-recursive' failed [ 154s] make[3]: *** [all-recursive] Error 1 [ 154s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 154s] Makefile:515: recipe for target 'all-recursive' failed [ 154s] make[2]: *** [all-recursive] Error 1 [ 154s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 154s] Makefile:446: 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:6: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 154s] [ 154s] sheep82 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:57:36 UTC 2018. [ 154s] [ 154s] ### VM INTERACTION START ### [ 157s] [ 148.838144] sysrq: SysRq : Power Off [ 157s] [ 148.843725] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] sheep82 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:57:39 UTC 2018. [ 157s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 30 19:58:10 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 30 Sep 2018 19:58:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5bb12ae0eee73_21059b26843636ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 171s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 171s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 171s] collect2: error: ld returned 1 exit status [ 171s] Makefile:473: recipe for target 'InterthreadTest' failed [ 171s] make[4]: *** [InterthreadTest] Error 1 [ 171s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 171s] Makefile:400: recipe for target 'all-recursive' failed [ 171s] make[3]: *** [all-recursive] Error 1 [ 171s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 171s] Makefile:515: recipe for target 'all-recursive' failed [ 171s] make[2]: *** [all-recursive] Error 1 [ 171s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 171s] Makefile:446: recipe for target 'all' failed [ 171s] make[1]: *** [all] Error 2 [ 171s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 171s] dh_auto_build: make -j1 returned exit code 2 [ 171s] debian/rules:6: recipe for target 'build' failed [ 171s] make: *** [build] Error 2 [ 171s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 171s] [ 171s] lamb55 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:58:01 UTC 2018. [ 171s] [ 171s] ### VM INTERACTION START ### [ 174s] [ 163.420305] sysrq: SysRq : Power Off [ 174s] [ 163.427746] reboot: Power down [ 174s] ### VM INTERACTION END ### [ 174s] [ 174s] lamb55 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:58:05 UTC 2018. [ 174s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 30 19:59:01 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 30 Sep 2018 19:59:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5bb12b1d9b2f3_21059b26843637f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 156s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 156s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 156s] collect2: error: ld returned 1 exit status [ 156s] Makefile:473: recipe for target 'InterthreadTest' failed [ 156s] make[4]: *** [InterthreadTest] Error 1 [ 156s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 156s] Makefile:400: recipe for target 'all-recursive' failed [ 156s] make[3]: *** [all-recursive] Error 1 [ 156s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 156s] Makefile:515: recipe for target 'all-recursive' failed [ 156s] make[2]: *** [all-recursive] Error 1 [ 156s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 156s] Makefile:446: recipe for target 'all' failed [ 156s] make[1]: *** [all] Error 2 [ 156s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 156s] dh_auto_build: make -j1 returned exit code 2 [ 156s] debian/rules:6: recipe for target 'build' failed [ 156s] make: *** [build] Error 2 [ 156s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 156s] [ 156s] lamb14 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:58:49 UTC 2018. [ 156s] [ 156s] ### VM INTERACTION START ### [ 160s] [ 148.969085] sysrq: SysRq : Power Off [ 160s] [ 148.976337] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] lamb14 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:58:53 UTC 2018. [ 160s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 30 19:59:18 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 30 Sep 2018 19:59:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5bb12b1de3227_21059b2684363845@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 206s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 206s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 206s] collect2: error: ld returned 1 exit status [ 206s] Makefile:473: recipe for target 'InterthreadTest' failed [ 206s] make[4]: *** [InterthreadTest] Error 1 [ 206s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 206s] Makefile:400: recipe for target 'all-recursive' failed [ 206s] make[3]: *** [all-recursive] Error 1 [ 206s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 206s] Makefile:515: recipe for target 'all-recursive' failed [ 206s] make[2]: *** [all-recursive] Error 1 [ 206s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 206s] Makefile:446: recipe for target 'all' failed [ 206s] make[1]: *** [all] Error 2 [ 206s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 206s] dh_auto_build: make -j1 returned exit code 2 [ 206s] debian/rules:6: recipe for target 'build' failed [ 206s] make: *** [build] Error 2 [ 206s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 206s] [ 206s] lamb70 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:58:58 UTC 2018. [ 206s] [ 206s] ### VM INTERACTION START ### [ 209s] [ 196.491933] sysrq: SysRq : Power Off [ 209s] [ 196.499664] reboot: Power down [ 209s] ### VM INTERACTION END ### [ 209s] [ 209s] lamb70 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:59:01 UTC 2018. [ 209s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 30 19:59:53 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 30 Sep 2018 19:59:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5bb12b3c594d9_21059b2684363918@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 225s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 225s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 225s] collect2: error: ld returned 1 exit status [ 225s] Makefile:473: recipe for target 'InterthreadTest' failed [ 225s] make[4]: *** [InterthreadTest] Error 1 [ 225s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 225s] Makefile:400: recipe for target 'all-recursive' failed [ 225s] make[3]: *** [all-recursive] Error 1 [ 225s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 225s] Makefile:515: recipe for target 'all-recursive' failed [ 225s] make[2]: *** [all-recursive] Error 1 [ 225s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 225s] Makefile:446: recipe for target 'all' failed [ 225s] make[1]: *** [all] Error 2 [ 225s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 225s] dh_auto_build: make -j1 returned exit code 2 [ 225s] debian/rules:6: recipe for target 'build' failed [ 225s] make: *** [build] Error 2 [ 225s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 225s] [ 225s] cloud133 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:59:34 UTC 2018. [ 225s] [ 225s] ### VM INTERACTION START ### [ 228s] [ 204.672030] sysrq: SysRq : Power Off [ 228s] [ 204.682892] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] cloud133 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Sun Sep 30 19:59:39 UTC 2018. [ 229s] -- 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 Sep 30 21:45:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 30 Sep 2018 21:45:55 +0000 Subject: Change in osmo-iuh[master]: fix transport layer addr again, for nano3g Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11167 Change subject: fix transport layer addr again, for nano3g ...................................................................... fix transport layer addr again, for nano3g The nano3G sends the RAB Assignment Response's Transport Layer Address in X.213 NSAP padded to 20 bytes (160bit). Do not interpret it as 4-byte IP address, which currently breaks nano3G voice calls (wrong RTP IP address). Recent commit I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 fixed decoding of X.213 NSAP that is exactly seven bytes, but broke decoding of the padded version from the nano3G. A proper X.213 NSAP decoding would still be more welcome than this patching back and forth, but this is (another) quick fix without spending too much time on it. Related: OS#3420 Change-Id: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3 --- M src/iu_helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/67/11167/1 diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 39b0521..bf82fde 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/11167 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: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3 Gerrit-Change-Number: 11167 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: